aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-04-09 16:34:38 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-04-11 12:49:20 +0000
commit7885bc899f8bd5952e23625dcf105b61bc1a1b38 (patch)
treeae8805ad76584e9d9586606c03949dd8e9731842
parent0a8a9f60e1343d99d0d48e46e294c5bcd1bc300e (diff)
ProjectExplorer: Fix kit duplication in target setup pagev4.9.0
Do not add a modified kit to the UI if it was already present. Fixes: QTCREATORBUG-21240 Change-Id: Ib4887902402734ce95bde21c26ec9188ee9e55da Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/projectexplorer/targetsetuppage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index aea75ad993..501e0efc39 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -382,6 +382,11 @@ void TargetSetupPage::handleKitUpdate(Kit *k)
m_importer->makePersistent(k);
bool acceptable = !m_requiredPredicate || m_requiredPredicate(k);
+ const bool wasAcceptable = Utils::contains(m_widgets, [k](const TargetSetupWidget *w) {
+ return w->kit() == k;
+ });
+ if (acceptable == wasAcceptable)
+ return;
if (!acceptable)
removeWidget(k);