From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 16 May 2011 10:37:50 +0000 (+0200)
Subject: Fix possible crash in qmakestepwidget
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32bc1c153c93212110d70384d24f88335c9cc11f;p=qt-creator-jp%2Fqt-creator-jp.git

Fix possible crash in qmakestepwidget

Reviewed-by: dt
---

diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index b2c349a2b0..063ea83143 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -498,10 +498,9 @@ void QMakeStepConfigWidget::qtVersionChanged()
 
 void QMakeStepConfigWidget::qtVersionsDumpUpdated(const QString &qmakeCommand)
 {
-    if (BaseQtVersion *version = m_step->qt4BuildConfiguration()->qtVersion()) {
-        if (version->qmakeCommand() == qmakeCommand)
-            qtVersionChanged();
-    }
+    BaseQtVersion *version = m_step->qt4BuildConfiguration()->qtVersion();
+    if (version && version->qmakeCommand() == qmakeCommand)
+        qtVersionChanged();
 }
 
 void QMakeStepConfigWidget::qmakeBuildConfigChanged()