forked from qt-creator/qt-creator
Conflicts: tests/unit/unittest/qmlprojectmanager/CMakeLists.txt Change-Id: Ib6fd9bf09d654a7a2fe995dad3bcd93eacade2fb
Conflicts: tests/unit/unittest/qmlprojectmanager/CMakeLists.txt Change-Id: Ib6fd9bf09d654a7a2fe995dad3bcd93eacade2fb