From 0017c2c305b307fc40f9c5cf2c3c22e582eb3269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Jen=C3=9Fen?= Date: Fri, 4 Apr 2025 14:02:53 +0200 Subject: [PATCH] QmlDesigner: fix kits not loaded warnings Change-Id: Iedf4120705c2e4f66d9acca104e1348848b73900 Reviewed-by: Knud Dollereder (cherry picked from commit ccaa6b6ec77b57e9867d70b8e529b0cc3638aa81) Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp | 2 ++ src/plugins/studiowelcome/studiowelcomeplugin.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp index 2405314dfb4..30c9796cf9c 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp @@ -853,6 +853,8 @@ int ToolBarBackend::currentStyle() const QStringList ToolBarBackend::kits() const { + if (!ProjectExplorer::KitManager::isLoaded()) + return {}; auto kits = Utils::filtered(ProjectExplorer::KitManager::kits(), [](ProjectExplorer::Kit *kit) { const auto qtVersion = QtSupport::QtKitAspect::qtVersion(kit); const auto dev = ProjectExplorer::DeviceKitAspect::device(kit); diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 0a8045bda0e..82baf3e9ef2 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -706,6 +706,8 @@ void StudioWelcomePlugin::extensionsInitialized() bool StudioWelcomePlugin::delayedInitialize() { QTimer::singleShot(2000, this, []() { + if (!ProjectExplorer::KitManager::isLoaded()) + return; auto modelManager = QmlJS::ModelManagerInterface::instance(); if (!modelManager) return;