forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp src/plugins/vcsbase/vcscommand.cpp Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778