From a91c997238253946604165bc17cc0a0c3e3bcb88 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 21 Feb 2012 22:23:48 +0100
Subject: 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 <joerg.bornemann@nokia.com>
---
 qmake/project.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qmake')

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.read(file, proj.variables()); // parse just that file (fromfile, infile)
             } else {
-- 
cgit v1.2.3