From e0441a9aecc941efac454f72767df897ed718727 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 18 Sep 2023 15:51:29 +0200 Subject: [PATCH] QmlDesigner: Choose new target from filtered targets Task-number: QDS-10137 Change-Id: Ic74262862996c73ab5119793b92575035d590f60 Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- .../components/toolbar/toolbarbackend.cpp | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp index b2f94d4df4b..1a8d3835fa7 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp @@ -504,17 +504,33 @@ void ToolBarBackend::setCurrentStyle(int index) view->resetPuppet(); } +ProjectExplorer::Kit *kitForDisplayName(const QString &displayName) +{ + const auto kits = ProjectExplorer::KitManager::kits(); + + for (auto kit : kits) { + if (kit->displayName() == displayName) + return kit; + } + + return {}; +} + void ToolBarBackend::setCurrentKit(int index) { auto project = ProjectExplorer::ProjectManager::startupProject(); QTC_ASSERT(project, return ); - const auto kits = ProjectExplorer::KitManager::kits(); + const auto kits = ToolBarBackend::kits(); - QTC_ASSERT(kits.size() > index, return); + QTC_ASSERT(kits.size() > index, return ); QTC_ASSERT(index >= 0, return ); - const auto kit = kits.at(index); + const auto kitDisplayName = kits.at(index); + + const auto kit = kitForDisplayName(kitDisplayName); + + QTC_ASSERT(kit, return ); auto newTarget = project->target(kit); if (!newTarget)