forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androidmanager.cpp src/plugins/android/androidrunner.cpp src/plugins/android/androidrunner.h src/plugins/qmldesigner/components/texteditor/texteditorview.cpp src/plugins/qmldesigner/components/texteditor/texteditorview.h src/plugins/qmldesigner/designmodecontext.cpp src/plugins/qmldesigner/designmodecontext.h src/plugins/qmljseditor/qmljseditingsettingspage.cpp Change-Id: Idada49bb7441e8c5b748bd75b2e6bb2351bd323e