Merge remote-tracking branch 'origin/qds/dev'

Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 9604c0f1ec6..b7a4725f814 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -113,6 +113,9 @@ static Utils::FilePath getMainUiFileWithFallback()
     auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(
         project->activeTarget()->buildSystem());
 
+    if (!qmlBuildSystem)
+        return {};
+
     auto mainUiFile = qmlBuildSystem->mainUiFilePath();
     if (mainUiFile.exists())
         return mainUiFile;
@@ -649,9 +652,11 @@ bool StudioWelcomePlugin::delayedInitialize()
 
         const QList<Kit *> kits = Utils::filtered(KitManager::kits(), [](const Kit *k) {
             const QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
-            const bool isQt6 = version && version->qtVersion().majorVersion() == 6;
+            const bool valid = version && version->isValid();
+            const bool isQt6 = valid && version->qtVersion().majorVersion() == 6;
+            const bool autoDetected = valid && version->isAutodetected();
 
-            return isQt6
+            return isQt6 && autoDetected
                    && ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k)
                           == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE;
         });