From 75da336d79c6629c1a23db58035acada468044c2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 13 Apr 2010 12:09:30 +0200
Subject: [PATCH] Make duplicate Qt import-version detection work better
If the same Qt version was imported twice then this was not
detected properly.
Reviewed-by: dt
---
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 4a73a035830..ef4b02ca68f 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -95,11 +95,10 @@ void TargetSetupPage::setImportInfos(const QList<ImportInfo> &infos)
// Find possible targets:
QStringList targets;
foreach (const ImportInfo &i, infos) {
- // Make sure we have no duplicate directories/version pairs:
+ // Make sure we have no duplicate directories:
bool skip = false;
foreach (const ImportInfo &j, m_infos) {
- if ((j.directory == i.directory) &&
- (j.version == i.version)) {
+ if (j.isExistingBuild && i.isExistingBuild && (j.directory == i.directory)) {
skip = true;
break;
}
--
GitLab