forked from qt-creator/qt-creator
Conflicts: doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc src/plugins/projectexplorer/runcontrol.cpp src/plugins/qmljseditor/qmljseditorsettings.cpp Change-Id: I113e3c8cd02e4bb6cbcd98a98436e46b96124f13
Conflicts: doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc src/plugins/projectexplorer/runcontrol.cpp src/plugins/qmljseditor/qmljseditorsettings.cpp Change-Id: I113e3c8cd02e4bb6cbcd98a98436e46b96124f13