summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-07 09:53:49 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-04-16 15:22:09 (GMT)
commit7ebc1a7a3f5212c7426c1c9e6a1275bb293e628c (patch)
treec747717dfc3f56c3395964bbbec48992b7aeeaf3 /qmake
parentd7bfacf05545c409943a745a75051839747c87ca (diff)
downloadQt-7ebc1a7a3f5212c7426c1c9e6a1275bb293e628c.zip
Qt-7ebc1a7a3f5212c7426c1c9e6a1275bb293e628c.tar.gz
Qt-7ebc1a7a3f5212c7426c1c9e6a1275bb293e628c.tar.bz2
do not expand variables in read()'s file name
it is positively backwards to apply any expansions at such a low level - they have already been applied where necessary. Reviewed-by: mariusSO
Diffstat (limited to 'qmake')
-rw-r--r--qmake/project.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 249ea67..b604453 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1245,8 +1245,7 @@ QMakeProject::read(const QString &file, QMap<QString, QStringList> &place)
reset();
const QString oldpwd = qmake_getpwd();
- QString filename = Option::fixPathToLocalOS(file);
- doVariableReplace(filename, place);
+ QString filename = Option::fixPathToLocalOS(file, false);
bool ret = false, using_stdin = false;
QFile qfile;
if(!strcmp(filename.toLatin1(), "-")) {