From 7ebc1a7a3f5212c7426c1c9e6a1275bb293e628c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Apr 2010 11:53:49 +0200 Subject: 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 --- qmake/project.cpp | 3 +-- 1 file changed, 1 insertion(+), 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 &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(), "-")) { -- cgit v0.12