diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-23 18:18:32 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-26 16:55:08 +0000 |
| commit | 99714239b616e628ff4e0afe3db7eb7511ccf569 (patch) | |
| tree | 0e904a3496bb3e03310c30f731da21a7a040532e /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 19c1161e5d35d512312f05e7a0ed87ac78a91369 (diff) | |
| download | qt-creator-99714239b616e628ff4e0afe3db7eb7511ccf569.tar.gz | |
fix usage of qt deployment paths
QT_INSTALL_*/dev properties have been added to qmake a while ago.
catch up with that.
Change-Id: I2bda68a1d4700c762a3d12600ac6aba123d4d0f8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 473cdfde06..bf169e0e3c 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1207,7 +1207,8 @@ QString BaseQtVersion::qmakeProperty(const QHash<ProKey,ProString> &versionInfo, PropertyVariant variant) { QString val = versionInfo.value(ProKey(QString::fromLatin1( - name + (variant == PropertyVariantGet ? "/get" : "/src")))).toQString(); + name + (variant == PropertyVariantDev ? "/dev" : + variant == PropertyVariantGet ? "/get" : "/src")))).toQString(); if (!val.isNull()) return val; return versionInfo.value(ProKey(QString::fromLatin1(name))).toQString(); |