forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp Change-Id: If96d0f0a3d48c2581e765e4afb8b23924c48bdd6
Conflicts: src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp Change-Id: If96d0f0a3d48c2581e765e4afb8b23924c48bdd6