diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index 1f303bdd179..505201e53a6 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp @@ -84,7 +84,7 @@ QString DesktopQtVersion::invalidReason() const QString tmp = BaseQtVersion::invalidReason(); if (tmp.isEmpty() && qtAbis().isEmpty()) return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version."); - return QString(); + return tmp; } QList DesktopQtVersion::qtAbis() const diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp index 0d75c0821ed..ecefb8fef7c 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp @@ -84,7 +84,7 @@ QString SimulatorQtVersion::invalidReason() const QString tmp = BaseQtVersion::invalidReason(); if (tmp.isEmpty() && qtAbis().isEmpty()) return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version."); - return QString(); + return tmp; } QList SimulatorQtVersion::qtAbis() const diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp index 571398fdd75..96b883ce005 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp @@ -107,7 +107,7 @@ QString SymbianQtVersion::invalidReason() const && (m_sbsV2Directory.isEmpty() || !QFileInfo(m_sbsV2Directory + QLatin1String("/sbs")).exists())) return QCoreApplication::translate("QtVersion", "SBS was not found."); - return QString(); + return tmp; } bool SymbianQtVersion::toolChainAvailable(const QString &id) const diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index c9c9850bc9f..6901e4c9427 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -757,6 +757,7 @@ void QtOptionsPageWidget::updateCurrentQtName() return; m_versions[currentItemIndex]->setDisplayName(m_versionUi->nameEdit->text()); currentItem->setText(0, m_versions[currentItemIndex]->displayName()); + updateDescriptionLabel(); }