Merge remote-tracking branch 'origin/9.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399

src/plugins/cmakeprojectmanager/cmaketool.cpp

@@ -295,6 +295,9 @@ CMakeTool::Version CMakeTool::version() const
 
 QString CMakeTool::versionDisplay() const
 {
+    if (m_executable.isEmpty())
+        return {};
+
     if (!isValid())
         return Tr::tr("Version not parseable");