forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qtcreator_ide_branding.pri Change-Id: I009308451e1c6276692412f498125d79a8f12a07
Conflicts: cmake/QtCreatorIDEBranding.cmake qtcreator_ide_branding.pri Change-Id: I009308451e1c6276692412f498125d79a8f12a07