forked from qt-creator/qt-creator
Conflicts: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmldesignerbase/CMakeLists.txt src/plugins/qmlprojectmanager/CMakeLists.txt Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
Conflicts: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmldesignerbase/CMakeLists.txt src/plugins/qmlprojectmanager/CMakeLists.txt Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d