diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-15 12:45:37 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-15 12:48:29 (GMT) |
| commit | 8295acce8b1ec3959bfd1d93028c31f49d5a5a67 (patch) | |
| tree | 65edf0821a6059609b9b08889a957081bfabfb30 /qmake/project.cpp | |
| parent | c5a0190054421ac5c3325bba6835b63c70b6bda2 (diff) | |
| download | Qt-8295acce8b1ec3959bfd1d93028c31f49d5a5a67.zip Qt-8295acce8b1ec3959bfd1d93028c31f49d5a5a67.tar.gz Qt-8295acce8b1ec3959bfd1d93028c31f49d5a5a67.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
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 764264f..01f997f 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 |