diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-12-03 22:07:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:27:06 +0000 |
| commit | 1043bf202bb848f8286f2c67ed2b8760fe9da8da (patch) | |
| tree | 8a5fcb87c3f0f517bcc9b0d2e8c4c6fa88ac265a /qmake | |
| parent | 5b27d02c35d7b3f3feea9c5c97119b677578621d (diff) | |
introduce /dev variants of qmake properties
these reflect the on-target paths (unlike /raw, which are host paths, just
without the -sysroot). this is necessary for anything deployment-related,
starting with RPATH.
Change-Id: I13d598995d0e4d6cb0dc1fc7938b8631cf3e3a95
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/property.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index bf1bb58a31..f7787aff99 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -80,6 +80,7 @@ QMakeProperty::QMakeProperty() : settings(0) m_values[ProKey(name + "/get")] = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::EffectivePaths); QString val = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::FinalPaths); if (!propList[i].raw) { + m_values[ProKey(name + "/dev")] = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::DevicePaths); m_values[ProKey(name)] = QLibraryInfo::location(propList[i].loc); name += "/raw"; } @@ -159,6 +160,7 @@ QMakeProperty::exec() ProString pval = value(ProKey(prop + "/raw")); ProString gval = value(ProKey(prop + "/get")); ProString sval = value(ProKey(prop + "/src")); + ProString dval = value(ProKey(prop + "/dev")); fprintf(stdout, "%s:%s\n", prop.toLatin1().constData(), val.toLatin1().constData()); if (!pval.isEmpty() && pval != val) fprintf(stdout, "%s/raw:%s\n", prop.toLatin1().constData(), pval.toLatin1().constData()); @@ -166,6 +168,8 @@ QMakeProperty::exec() fprintf(stdout, "%s/get:%s\n", prop.toLatin1().constData(), gval.toLatin1().constData()); if (!sval.isEmpty() && sval != gval) fprintf(stdout, "%s/src:%s\n", prop.toLatin1().constData(), sval.toLatin1().constData()); + if (!dval.isEmpty() && dval != pval) + fprintf(stdout, "%s/dev:%s\n", prop.toLatin1().constData(), dval.toLatin1().constData()); } return true; } |