forked from qt-creator/qt-creator
Conflicts: qtcreator.pri src/plugins/debugger/breakhandler.cpp src/plugins/qt4projectmanager/qtversionmanager.cpp
Conflicts: qtcreator.pri src/plugins/debugger/breakhandler.cpp src/plugins/qt4projectmanager/qtversionmanager.cpp