Conflicts: doc/qtcreator.qdoc src/plugins/qt4projectmanager/qt4project.cpp src/tools/qpatch/qpatch.cpp