path: root/qmake
diff options
authorOswald Buddenhagen <>2012-02-21 22:23:48 +0100
committerQt by Nokia <>2012-03-05 14:46:36 +0100
commita91c997238253946604165bc17cc0a0c3e3bcb88 (patch)
tree967ce6c5966c3c8e066d5b3479c3109942e76aa4 /qmake
parentdeb3c134b5b718e429a71ed0cff8f1f711b30e62 (diff)
give load()/include() with target and infile()/$$fromfile() a clean environment
load()/include() with a target namespace would inherit the current context. however, if you source a project with all bells and whistles, this makes completely no sense and may be actually counterproductive. infile()/$$fromfile() would have interited only the functions from the current context. that was only a hack to support abusing them. Change-Id: I2e992b923d9e5b0e5056001ca49b35de573abc63 Reviewed-by: Joerg Bornemann <>
Diffstat (limited to 'qmake')
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 397b4aee18..ecd31d5234 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1633,7 +1633,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
if(flags & (IncludeFlagNewProject|IncludeFlagNewParser)) {
// The "project's variables" are used in other places (eg. export()) so it's not
// possible to use "place" everywhere. Instead just set variables and grab them later
- QMakeProject proj(this, &place);
+ QMakeProject proj(prop);
if(flags & IncludeFlagNewParser) {
parsed =, proj.variables()); // parse just that file (fromfile, infile)
} else {