From 75abcda936d0355077aa2bfbfe92bb56340127a0 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 10 Feb 2010 17:00:14 +0100
Subject: [PATCH] Use sane Qt version on import
---
.../qt4projectmanager/qt4buildconfiguration.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index dec9fa033fd..1cf57a5b054 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -125,6 +125,19 @@ bool Qt4BuildConfiguration::fromMap(const QVariantMap &map)
m_toolChainType = map.value(QLatin1String(TOOLCHAIN_KEY)).toInt();
m_qmakeBuildConfiguration = QtVersion::QmakeBuildConfigs(map.value(QLatin1String(BUILD_CONFIGURATION_KEY)).toInt());
+ // Pick a decent Qt version if the default version is used:
+ if (m_qtVersionId == 0) {
+ QList<QtVersion *> versions = QtVersionManager::instance()->versions();
+ foreach (QtVersion *v, versions) {
+ if (v->isValid())
+ m_qtVersionId = v->uniqueId();
+ if (v->supportsTargetId(QLatin1String(DESKTOP_TARGET_ID)))
+ break;
+ }
+ if (m_qtVersionId == 0)
+ m_qtVersionId = versions.at(0)->uniqueId();
+ }
+
if (!qtVersion()->supportedTargetIds().contains(target()->id()))
return false;
--
GitLab