From 32bc1c153c93212110d70384d24f88335c9cc11f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 16 May 2011 12:37:50 +0200
Subject: [PATCH] Fix possible crash in qmakestepwidget
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qmakestep.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index b2c349a2b01..063ea83143e 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()
--
GitLab