summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-04-15 12:45:37 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-04-19 09:14:38 (GMT)
commit13e9418201ccf8fde6593ec813b3b4cb6c17ff3d (patch)
tree0a6c564dcdb5c6e337e5a2a79e3f19fa090c9459
parent596ea4b5c4e53b0a600ae3436bb49d5740821bd9 (diff)
downloadQt-13e9418201ccf8fde6593ec813b3b4cb6c17ff3d.zip
Qt-13e9418201ccf8fde6593ec813b3b4cb6c17ff3d.tar.gz
Qt-13e9418201ccf8fde6593ec813b3b4cb6c17ff3d.tar.bz2
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)
-rw-r--r--qmake/project.cpp2
1 files changed, 1 insertions, 1 deletions
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