summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-07 09:44:14 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-30 15:02:39 (GMT)
commit6ef890d0011462b11a18d13dd0e6adfa30cb6a0b (patch)
treea7a08500e8e3419cc262c5232933aac44ed78d69 /qmake/project.cpp
parentdf4333e16022ad6c634efe54fe071f437d949896 (diff)
downloadQt-6ef890d0011462b11a18d13dd0e6adfa30cb6a0b.zip
Qt-6ef890d0011462b11a18d13dd0e6adfa30cb6a0b.tar.gz
Qt-6ef890d0011462b11a18d13dd0e6adfa30cb6a0b.tar.bz2
do not env-expand cache file path
it makes totally no sense - if one wanted to expand env variables, one would let the shell do it. Reviewed-by: joerg
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 7e8952f..2bafada 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -563,7 +563,7 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
QString path;
int last_slash = Option::mkfile::cachefile.lastIndexOf(QDir::separator());
if(last_slash != -1)
- path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash));
+ path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash), false);
for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it)
feature_roots << (path + (*concat_it));