From 662e6f111932a5715a4f575dbbab190a930e3776 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 24 Aug 2012 18:25:46 +0200
Subject: [PATCH] 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>
---
 src/shared/proparser/qmakeglobals.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp
index 4face864558..ea2dde36890 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;
 }