diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-07-09 15:31:09 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-08-18 17:17:50 +0200 |
| commit | 4a52d8216c3450a8bd4e975ecad933f6ff20781b (patch) | |
| tree | d29714939d02cf42121c01697016503f8a88135c /src/plugins/qnx | |
| parent | 351abd035b4aa13fcc36f7bbe206f54a6c01eaff (diff) | |
| download | qt-creator-4a52d8216c3450a8bd4e975ecad933f6ff20781b.tar.gz | |
Kit: Introduce variables for Kit display names
This change also adds a AbstractMacroExpander for the QtKitInformation.
It supports the following variables in the Kit display name:
%{Qt:version} - Qt version number
%{Qt:type} - Qt type
%{Qt:name} - Qt version name
%{Qt:mkspec} - mkspec used by the Qt version
Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/qnx')
| -rw-r--r-- | src/plugins/qnx/blackberryapilevelconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qnx/qnxconfiguration.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp index 49c3ef0709..ca71fa9e0a 100644 --- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp +++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp @@ -250,7 +250,7 @@ Kit *BlackBerryApiLevelConfiguration::createKit( DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE); SysRootKitInformation::setSysRoot(kit, m_sysRoot); - kit->setDisplayName(version->displayName()); + kit->setUnexpandedDisplayName(version->displayName()); kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_BB_CATEGORY_ICON))); kit->setAutoDetected(true); diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index 56ebc7ee31..5f1183f399 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -228,7 +228,7 @@ ProjectExplorer::Kit *QnxConfiguration::createKit(QnxArchitecture arch, DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_QNX_OS_TYPE); // TODO: Add sysroot? - kit->setDisplayName(displayName); + kit->setUnexpandedDisplayName(displayName); kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_CATEGORY_ICON))); kit->setAutoDetected(true); |