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