diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 16:35:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 16:35:13 (GMT) |
| commit | b6f4fa4ca70d435166365cfab6b2bf6e0f5fff05 (patch) | |
| tree | 65f42ad9254a8ff1488ceb5c15a869406527500b | |
| parent | 07f724cd5abd0548fb32ed3469bde113daf028c4 (diff) | |
| parent | 8295acce8b1ec3959bfd1d93028c31f49d5a5a67 (diff) | |
| download | Qt-b6f4fa4ca70d435166365cfab6b2bf6e0f5fff05.zip Qt-b6f4fa4ca70d435166365cfab6b2bf6e0f5fff05.tar.gz Qt-b6f4fa4ca70d435166365cfab6b2bf6e0f5fff05.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix option(recursive)
| -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 |