diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-07-26 10:15:28 +0000 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-07-26 12:31:12 +0200 |
| commit | 70a2f91d779dc9ce25a3d2ca90d95af3e41b22b1 (patch) | |
| tree | 17b173d50841fd510c35642f258e0f7121ca4b2b | |
| parent | 453ae2326f05d07691ed09e61bc26694a9ce6129 (diff) | |
| download | qt-creator-70a2f91d779dc9ce25a3d2ca90d95af3e41b22b1.tar.gz | |
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>
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index 898832c00c..2e310ac6ab 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 { |