forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/plugins/qmljseditor/qmljseditordocument.cpp Change-Id: Ibef70b4c0eba5ccd5da7b05ca2bd3a9e8ee1cc0c
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/plugins/qmljseditor/qmljseditordocument.cpp Change-Id: Ibef70b4c0eba5ccd5da7b05ca2bd3a9e8ee1cc0c