Conflicts: doc/qtcreator.qdoc src/plugins/debugger/debuggermanager.cpp src/plugins/texteditor/basetexteditor.cpp
