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

fix usage of qt deployment paths

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2017-01-23 18:18:32 +01:00
parent 19c1161e5d
commit 99714239b6
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxqtversion.cpp
View File

@@ -148,7 +148,7 @@ void QnxQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Enviro
updateEnvironment(); updateEnvironment();
env.modify(m_qnxEnv); env.modify(m_qnxEnv);
env.prependOrSetLibrarySearchPath(qmakeProperty("QT_INSTALL_LIBS")); // FIXME: PropertyVariantDev env.prependOrSetLibrarySearchPath(qmakeProperty("QT_INSTALL_LIBS", PropertyVariantDev));
} }
Utils::Environment QnxQtVersion::qmakeRunEnvironment() const Utils::Environment QnxQtVersion::qmakeRunEnvironment() const

3
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1207,7 +1207,8 @@ QString BaseQtVersion::qmakeProperty(const QHash<ProKey,ProString> &versionInfo,
PropertyVariant variant) PropertyVariant variant)
{ {
QString val = versionInfo.value(ProKey(QString::fromLatin1( 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()) if (!val.isNull())
return val; return val;
return versionInfo.value(ProKey(QString::fromLatin1(name))).toQString(); return versionInfo.value(ProKey(QString::fromLatin1(name))).toQString();

2
src/plugins/qtsupport/baseqtversion.h
View File

@@ -122,7 +122,7 @@ public:
QList<ProjectExplorer::Abi> qtAbis() const; QList<ProjectExplorer::Abi> qtAbis() const;
virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0; virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0;
enum PropertyVariant { PropertyVariantGet, PropertyVariantSrc }; enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc };
QString qmakeProperty(const QByteArray &name, QString qmakeProperty(const QByteArray &name,
PropertyVariant variant = PropertyVariantGet) const; PropertyVariant variant = PropertyVariantGet) const;
void applyProperties(QMakeGlobals *qmakeGlobals) const; void applyProperties(QMakeGlobals *qmakeGlobals) const;

4
src/shared/proparser/qmakeglobals.cpp
View File

@@ -351,7 +351,7 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri
variant = PropRaw; variant = PropRaw;
else if (name.endsWith(QLatin1String("/get"))) else if (name.endsWith(QLatin1String("/get")))
variant = PropGet; variant = PropGet;
else // Nothing falls back on /src. else // Nothing falls back on /src or /dev.
continue; continue;
name.chop(4); name.chop(4);
} else { } else {
@@ -372,6 +372,8 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri
} }
properties.insert(ProKey(name + QLatin1String("/raw")), value); properties.insert(ProKey(name + QLatin1String("/raw")), value);
} }
if (variant <= PropRaw)
properties.insert(ProKey(name + QLatin1String("/dev")), value);
} else if (!name.startsWith(QLatin1String("QT_HOST_"))) { } else if (!name.startsWith(QLatin1String("QT_HOST_"))) {
continue; continue;
} }