Qt: Make Symbian versions invalid if sbsv2 setup is wrong

2011-05-04 13:38:06 +02:00
parent 52010b4d95
commit 48c6f40343
1 changed files with 5 additions and 1 deletions
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1831,7 +1831,11 @@ bool QtVersion::isValid() const
            && (!m_mkspecFullPath.isEmpty() || !m_abiUpToDate)
            && !m_abis.isEmpty()
            && m_qmakeIsExecutable
-            && m_validSystemRoot;
+            && m_validSystemRoot
+            && (!isBuildWithSymbianSbsV2()
+                || (isBuildWithSymbianSbsV2()
+                    && !m_sbsV2Directory.isEmpty()
+                    && QFileInfo(m_sbsV2Directory + QLatin1String("/sbs")).exists()));
 }

 bool QtVersion::toolChainAvailable(const QString &id) const