diff options
| author | Eike Ziller <[email protected]> | 2014-10-24 11:39:22 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2014-10-24 11:56:12 +0200 |
| commit | 7735dd6e9470c0c682fdfd2732371ba7e0c18ecf (patch) | |
| tree | b56b685d193dddde62afd9aecaf4ce6f79d48a12 | |
| parent | 75da1cb884a6e7af3ab3c9de6d22b9f597afcfc6 (diff) | |
Qt version: Fix macro usage in default display names
The variables were changed to start with uppercase characters
Change-Id: I0173e5c943395aa2729d873f9ef7e5d860e906ec
Reviewed-by: hjk <[email protected]>
| -rw-r--r-- | src/plugins/qnx/blackberryapilevelconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp index 2ea838b7db3..cf4e05c436b 100644 --- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp +++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp @@ -221,7 +221,7 @@ QnxAbstractQtVersion *BlackBerryApiLevelConfiguration::createQtVersion( { QnxAbstractQtVersion *version = new BlackBerryQtVersion( arch, qmakePath, true, QString(), envFile().toString()); - version->setUnexpandedDisplayName(tr("Qt %{Qt:version} for %2") + version->setUnexpandedDisplayName(tr("Qt %{Qt:Version} for %2") .arg(version->qtVersionString(), versionName)); QtVersionManager::addVersion(version); return version; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index aa3dc1034c8..430c1d49e2e 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -285,8 +285,8 @@ QString BaseQtVersion::defaultUnexpandedDisplayName(const FileName &qmakePath, b } return fromPath ? - QCoreApplication::translate("QtVersion", "Qt %{Qt:version} in PATH (%2)").arg(location) : - QCoreApplication::translate("QtVersion", "Qt %{Qt:version} (%2)").arg(location); + QCoreApplication::translate("QtVersion", "Qt %{Qt:Version} in PATH (%2)").arg(location) : + QCoreApplication::translate("QtVersion", "Qt %{Qt:Version} (%2)").arg(location); } FeatureSet BaseQtVersion::availableFeatures() const diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 021645303b0..4b71d45fa83 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -195,7 +195,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent) this, SLOT(toolChainsUpdated())); auto chooser = new Core::VariableChooser(this); - chooser->addSupportedWidget(m_versionUi->nameEdit, "Qt:name"); + chooser->addSupportedWidget(m_versionUi->nameEdit, "Qt:Name"); chooser->addMacroExpanderProvider( [this]() -> Utils::MacroExpander * { BaseQtVersion *version = currentVersion(); |