Merge remote-tracking branch 'origin/9.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/texteditor/texteditor.cpp

Change-Id: I9c8f1331be3f5442f1fd28aeb0a9bc07128629d1

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -538,6 +538,11 @@ QWidget *QMakeStep::createConfigWidget()
             BuildManager::buildLists({bc->cleanSteps()});
     });
 
+    connect(widget, &QObject::destroyed, this, [this] {
+        abisLabel = nullptr;
+        abisListWidget = nullptr;
+    });
+
     VariableChooser::addSupportForChildWidgets(widget, macroExpander());
 
     return widget;