feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix QtVersion::invalidReason for symbian/desktop/simulator

Browse Source 
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
This commit is contained in:
dt
2011-05-16 13:08:07 +02:00
parent 2c0698e391
commit d135e33a04
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
View File

@@ -84,7 +84,7 @@ QString DesktopQtVersion::invalidReason() const
QString tmp = BaseQtVersion::invalidReason(); QString tmp = BaseQtVersion::invalidReason();
if (tmp.isEmpty() && qtAbis().isEmpty()) if (tmp.isEmpty() && qtAbis().isEmpty())
return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version."); 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 QList<ProjectExplorer::Abi> DesktopQtVersion::qtAbis() const

2
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
View File

@@ -84,7 +84,7 @@ QString SimulatorQtVersion::invalidReason() const
QString tmp = BaseQtVersion::invalidReason(); QString tmp = BaseQtVersion::invalidReason();
if (tmp.isEmpty() && qtAbis().isEmpty()) if (tmp.isEmpty() && qtAbis().isEmpty())
return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version."); return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version.");
return QString(); return tmp;
} }
QList<ProjectExplorer::Abi> SimulatorQtVersion::qtAbis() const QList<ProjectExplorer::Abi> SimulatorQtVersion::qtAbis() const

2
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
View File

@@ -107,7 +107,7 @@ QString SymbianQtVersion::invalidReason() const
&& (m_sbsV2Directory.isEmpty() || !QFileInfo(m_sbsV2Directory + QLatin1String("/sbs")).exists())) && (m_sbsV2Directory.isEmpty() || !QFileInfo(m_sbsV2Directory + QLatin1String("/sbs")).exists()))
return QCoreApplication::translate("QtVersion", "SBS was not found."); return QCoreApplication::translate("QtVersion", "SBS was not found.");
return QString(); return tmp;
} }
bool SymbianQtVersion::toolChainAvailable(const QString &id) const bool SymbianQtVersion::toolChainAvailable(const QString &id) const

1
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -757,6 +757,7 @@ void QtOptionsPageWidget::updateCurrentQtName()
return; return;
m_versions[currentItemIndex]->setDisplayName(m_versionUi->nameEdit->text()); m_versions[currentItemIndex]->setDisplayName(m_versionUi->nameEdit->text());
currentItem->setText(0, m_versions[currentItemIndex]->displayName()); currentItem->setText(0, m_versions[currentItemIndex]->displayName());
updateDescriptionLabel();
} }