From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 3 Feb 2012 17:28:54 +0000 (+0100)
Subject: scope context saving more minimally
X-Git-Tag: qt-v5.0.0-alpha1~708
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd7befcfd84a9a648fa467dda3fe45988bfc5604;p=profile%2Fivi%2Fqtbase.git

scope context saving more minimally

no point in saving the context when we are not actually modifying the
current context.

Change-Id: Id6f51a163e86bdf402aa0713737b655db68e7ee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
---

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 3546ac9..eb07dea 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1712,9 +1712,6 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
         warn_msg(WarnParser, "%s:%d: QtScript support disabled for %s.",
                  pi.file.toLatin1().constData(), pi.line_no, orig_file.toLatin1().constData());
     } else {
-        QStack<ScopeBlock> sc = scope_blocks;
-        IteratorBlock *it = iterator;
-        FunctionBlock *fu = function;
         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
@@ -1730,11 +1727,14 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
             }
             place = proj.variables();
         } else {
+            QStack<ScopeBlock> sc = scope_blocks;
+            IteratorBlock *it = iterator;
+            FunctionBlock *fu = function;
             parsed = read(file, place);
+            iterator = it;
+            function = fu;
+            scope_blocks = sc;
         }
-        iterator = it;
-        function = fu;
-        scope_blocks = sc;
     }
     if(parsed) {
         if(place["QMAKE_INTERNAL_INCLUDED_FILES"].indexOf(orig_file) == -1)