From 13e9418201ccf8fde6593ec813b3b4cb6c17ff3d Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 15 Apr 2010 15:45:37 +0300
Subject: Fix option(recursive)

QMakeProject::init initializes the whole project, while
QMakeProject::reset initializes the parser for a single file.
"recursive" needs to apply to the whole project.

Task-number: QTBUG-9847
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit 8295acce8b1ec3959bfd1d93028c31f49d5a5a67)
---
 qmake/project.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 56707cf..5ee3d0c 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -675,6 +675,7 @@ QMakeProject::init(QMakeProperty *p, const QMap<QString, QStringList> *vars)
         prop = p;
         own_prop = false;
     }
+    recursive = false;
     reset();
 }
 
@@ -699,7 +700,6 @@ QMakeProject::reset()
     scope_blocks.push(ScopeBlock());
     iterator = 0;
     function = 0;
-    recursive = false;
 }
 
 bool
-- 
cgit v0.12