diff options
author | dt <qtc-committer@nokia.com> | 2009-08-28 17:20:37 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-08-31 10:26:05 +0200 |
commit | bca3c66103733281eace7e82fc4c968490202171 (patch) | |
tree | 88b0ea9efb3c26067619222387c606ae0b234aea | |
parent | a11695f5e698359c20232a99c6dc00e328d3ad22 (diff) |
Do some more checks, maybe one of them is the reason for a crash.
(cherry picked from commit f862a034c0badc1ba429f1e7b63cca264b1c1cb6)
-rw-r--r-- | src/plugins/qt4projectmanager/profilereader.cpp | 5 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 10 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp index 9eadad4fd3..76c7813886 100644 --- a/src/plugins/qt4projectmanager/profilereader.cpp +++ b/src/plugins/qt4projectmanager/profilereader.cpp @@ -46,7 +46,10 @@ ProFileReader::~ProFileReader() } void ProFileReader::setQtVersion(QtVersion *qtVersion) { - m_option.properties = qtVersion->versionInfo(); + if (qtVersion) + m_option.properties = qtVersion->versionInfo(); + else + m_option.properties.clear(); } bool ProFileReader::readProFile(const QString &fileName) diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index 5601428890..5f4551d57c 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -131,8 +131,10 @@ void Qt4ProjectConfigWidget::updateDetails() QString versionString; if (m_pro->qtVersionId(m_buildConfiguration) == 0) { versionString = tr("Default Qt Version (%1)").arg(version->name()); - } else { + } else if(version){ versionString = version->name(); + } else { + versionString = tr("No Qt Version set"); } // Qt Version, Build Directory and Toolchain m_ui->titleLabel->setText(tr("using Qt version: <b>%1</b><br>" diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 47f5a23331..48965512e1 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -629,14 +629,20 @@ QString Qt4RunConfiguration::dumperLibrary() const { Qt4Project *pro = qobject_cast<Qt4Project *>(project()); QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration()); - return version->debuggingHelperLibrary(); + if (version) + return version->debuggingHelperLibrary(); + else + return QString::null; } QStringList Qt4RunConfiguration::dumperLibraryLocations() const { Qt4Project *pro = qobject_cast<Qt4Project *>(project()); QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration()); - return version->debuggingHelperLibraryLocations();; + if (version) + return version->debuggingHelperLibraryLocations(); + else + return QStringList(); } void Qt4RunConfiguration::setBaseEnvironmentBase(BaseEnvironmentBase env) |