forked from qt-creator/qt-creator
solved conflicts in: cmake/Utils.cmake src/libs/sqlite/sqliteids.h src/libs/utils/filepath.cpp src/plugins/effectcomposer/effectcomposermodel.cpp src/plugins/effectcomposer/effectcomposerview.cpp src/plugins/effectcomposer/effectshaderscodeeditor.h src/plugins/mcusupport/mcubuildstep.cpp src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp src/plugins/qmldesigner/components/devicesharing/devicemanager.cpp src/plugins/qmldesigner/qmldesignerprojectmanager.cpp src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp Change-Id: Ia2f6ccfd39007dad1cb8317f5ac878109621aaa2