From 70a2f91d779dc9ce25a3d2ca90d95af3e41b22b1 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 26 Jul 2011 10:15:28 +0000
Subject: [PATCH] Crash: Fix crash when importing broken Qt versions
Fix a crash when importing a build, using a qmake that is broken.
I ran into this crash with a 32bit qmake used in a pure 64bit userland.
Change-Id: I08acb8d5f2cd72c873a30be5e45324f6daef702c
Reviewed-on: http://codereview.qt.nokia.com/2181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 898832c00c0..2e310ac6ab9 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -370,7 +370,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
newVersion = QtSupport::QtVersionFactory::createQtVersionFromQMakePath(qmakePath);
mustDelete = true;
}
- targetMatches = newVersion->supportsTargetId(m_buildConfiguration->target()->id());
+ targetMatches = newVersion ? newVersion->supportsTargetId(m_buildConfiguration->target()->id()) : false;
if (mustDelete)
delete newVersion;
} else {
--
GitLab