Merge remote-tracking branch 'origin/8.0'

Reverts/comments out parts of 45f93a817a,
which needs to be resolved in a follow-up commit.

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
	src/plugins/python/pythoneditor.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
	src/plugins/scxmleditor/common/colorsettings.cpp

Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b

src/plugins/cmakeprojectmanager/cmakesettingspage.cpp

@@ -435,7 +435,6 @@ public:
 private:
     void onBinaryPathEditingFinished();
     void updateQchFilePath();
-    void reload();
 
     CMakeToolItemModel *m_model;
     QLineEdit *m_displayNameLineEdit;
@@ -501,7 +500,6 @@ void CMakeToolItemConfigWidget::onBinaryPathEditingFinished()
 {
     updateQchFilePath();
     store();
-    reload();
 }
 
 void CMakeToolItemConfigWidget::updateQchFilePath()
@@ -510,18 +508,6 @@ void CMakeToolItemConfigWidget::updateQchFilePath()
         m_qchFileChooser->setFilePath(CMakeTool::searchQchFile(m_binaryChooser->filePath()));
 }
 
-void CMakeToolItemConfigWidget::reload()
-{
-    if (!m_id.isValid())
-        return;
-
-    const CMakeToolTreeItem *item = m_model->cmakeToolItem(m_id);
-    if (!item)
-        return;
-
-    load(item);
-}
-
 void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item)
 {
     m_loadingItem = true; // avoid intermediate signal handling