diff options
author | dt <qtc-committer@nokia.com> | 2011-05-16 13:08:07 +0200 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2011-05-16 13:08:52 +0200 |
commit | d135e33a0429d170a8e983702f2639c9279d639a (patch) | |
tree | 86bf1160106c1e79c0843880659de8aa0ba5f36e /src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | |
parent | 2c0698e3917d64e0ca5b547a22967eca2e52974e (diff) |
Fix QtVersion::invalidReason for symbian/desktop/simulator
Actually pass on the base qt version value...
Also fix a small issue on the qt versions page that prevented the
invalid reason showing up for a nameless version
Task-Nr: QTCREATORBUG-4899
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index 1f303bdd17..505201e53a 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<ProjectExplorer::Abi> DesktopQtVersion::qtAbis() const |