diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-04-13 12:09:30 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-04-13 17:23:10 +0200 |
| commit | e6115fa7c99e314302d6f819a7236a28e13ac4de (patch) | |
| tree | 2180899c7eeb6a5aa6dbd350bbd9f6b019588328 | |
| parent | d9ccf5abec76778a98b4632c18545bccd6374b19 (diff) | |
| download | qt-creator-e6115fa7c99e314302d6f819a7236a28e13ac4de.tar.gz | |
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
(cherry picked from commit 75da336d79c6629c1a23db58035acada468044c2)
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index 573f7c7166..da30f77274 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; } |