OSDN Git Service

Fix another crash when BaseQtVersion == 0.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 25 May 2011 07:25:04 +0000 (09:25 +0200)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 25 May 2011 08:18:59 +0000 (10:18 +0200)
Change-Id: I635bbc5c0120f8bf15b918ef8205cf72298720f0
Reviewed-on: http://codereview.qt.nokia.com/98
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp

index 3569c97..f0cf14b 100644 (file)
@@ -388,16 +388,15 @@ void Qt4ProjectConfigWidget::updateImportLabel()
     if (m_buildConfiguration->shadowBuild())
         buildDirectory = m_buildConfiguration->buildDirectory();
     QList<ProjectExplorer::Task> issues;
-    QtSupport::BaseQtVersion *version = m_buildConfiguration->qtVersion();
-    if (version)
+    if (QtSupport::BaseQtVersion *version = m_buildConfiguration->qtVersion()) {
         issues = version->reportIssues(m_buildConfiguration->target()->project()->file()->fileName(),
-                                                                 buildDirectory);
+                                       buildDirectory);
+        foreach (Qt4BaseTargetFactory *factory,
+                 Qt4BaseTargetFactory::qt4BaseTargetFactoriesForIds(version->supportedTargetIds().toList()))
+            issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->file()->fileName()));
 
-    foreach (Qt4BaseTargetFactory *factory,
-             Qt4BaseTargetFactory::qt4BaseTargetFactoriesForIds(version->supportedTargetIds().toList()))
-        issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->file()->fileName()));
-
-    qSort(issues);
+        qSort(issues);
+    }
 
     if (incompatibleBuild) {
         m_ui->problemLabel->setVisible(true);