forked from qt-creator/qt-creator
Conflicts: src/plugins/qmljseditor/qmljseditingsettingspage.cpp src/plugins/qmljseditor/qmllssettings.h Change-Id: I49b97101467a6e80653c0f5f3e3fe5801dca5274
Conflicts: src/plugins/qmljseditor/qmljseditingsettingspage.cpp src/plugins/qmljseditor/qmllssettings.h Change-Id: I49b97101467a6e80653c0f5f3e3fe5801dca5274