diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-24 18:25:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-28 14:33:26 +0200 |
| commit | 662e6f111932a5715a4f575dbbab190a930e3776 (patch) | |
| tree | 5a11b86d622629846b9922ea1b3bc594413337f3 /src | |
| parent | 2debcc288171b529d873c2fdfd8315fd4492c3a5 (diff) | |
| download | qt-creator-662e6f111932a5715a4f575dbbab190a930e3776.tar.gz | |
resolve relative paths in $QMAKEPATH & $QMAKEFEATURES
we use the actual current directory as the base dir, as that's closest
to what qmake would do so far. it's completely arbitrary what will
happen when shadow-building or specifying an output directory, and in
creator context it's pretty much meaningless.
Change-Id: I8c490c86fa2606fcee5d176c90c5a84a4783e87b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index 4face86455..ea2dde3689 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -182,10 +182,11 @@ QStringList QMakeGlobals::getPathListEnv(const QString &var) const QStringList ret; QString val = getEnv(var); if (!val.isEmpty()) { + QDir bdir; QStringList vals = val.split(dirlist_sep); ret.reserve(vals.length()); foreach (const QString &it, vals) - ret << QDir::cleanPath(it); + ret << QDir::cleanPath(bdir.absoluteFilePath(it)); } return ret; } |