forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc qbs/modules/qtc/qtc.qbs Change-Id: I67a2540677a8b5c309c0c81e2a509a61d0a65aa8
Conflicts: cmake/QtCreatorIDEBranding.cmake doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc qbs/modules/qtc/qtc.qbs Change-Id: I67a2540677a8b5c309c0c81e2a509a61d0a65aa8