forked from qt-creator/qt-creator
Conflicts: doc/qtcreator.qdoc src/plugins/debugger/debuggermanager.cpp src/plugins/texteditor/basetexteditor.cpp
Conflicts: doc/qtcreator.qdoc src/plugins/debugger/debuggermanager.cpp src/plugins/texteditor/basetexteditor.cpp