forked from qt-creator/qt-creator
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/texteditor/texteditor.cpp Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/texteditor/texteditor.cpp Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1