diff options
| -rw-r--r-- | src/plugins/qnx/qnxqtversion.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 2 | ||||
| -rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 3b645a54b70..13376a499b7 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -148,7 +148,7 @@ void QnxQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Enviro updateEnvironment(); env.modify(m_qnxEnv); - env.prependOrSetLibrarySearchPath(qmakeProperty("QT_INSTALL_LIBS")); // FIXME: PropertyVariantDev + env.prependOrSetLibrarySearchPath(qmakeProperty("QT_INSTALL_LIBS", PropertyVariantDev)); } Utils::Environment QnxQtVersion::qmakeRunEnvironment() const diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 473cdfde068..bf169e0e3cc 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(); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 1fe09a2ef4c..2ccaa773723 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -122,7 +122,7 @@ public: QList<ProjectExplorer::Abi> qtAbis() const; virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0; - enum PropertyVariant { PropertyVariantGet, PropertyVariantSrc }; + enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc }; QString qmakeProperty(const QByteArray &name, PropertyVariant variant = PropertyVariantGet) const; void applyProperties(QMakeGlobals *qmakeGlobals) const; diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index a1d19892b9d..a50fa5437a0 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -351,7 +351,7 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri variant = PropRaw; else if (name.endsWith(QLatin1String("/get"))) variant = PropGet; - else // Nothing falls back on /src. + else // Nothing falls back on /src or /dev. continue; name.chop(4); } else { @@ -372,6 +372,8 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri } properties.insert(ProKey(name + QLatin1String("/raw")), value); } + if (variant <= PropRaw) + properties.insert(ProKey(name + QLatin1String("/dev")), value); } else if (!name.startsWith(QLatin1String("QT_HOST_"))) { continue; } |