forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/qtsupport/examplesparser.cpp Change-Id: I2a0808261969e8c7cef7fae86d9027a155bf9b14
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/qtsupport/examplesparser.cpp Change-Id: I2a0808261969e8c7cef7fae86d9027a155bf9b14