diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 06:28:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 06:28:13 (GMT) |
| commit | d19f732ba223871e35c02a903c7a10f5ea62c01b (patch) | |
| tree | a1d667ed368c4708e6089f1c7679d30deee911f8 | |
| parent | 140a96d0b860b045c18d53c1ac96e77b3893d31c (diff) | |
| parent | b6f4fa4ca70d435166365cfab6b2bf6e0f5fff05 (diff) | |
| download | Qt-d19f732ba223871e35c02a903c7a10f5ea62c01b.zip Qt-d19f732ba223871e35c02a903c7a10f5ea62c01b.tar.gz Qt-d19f732ba223871e35c02a903c7a10f5ea62c01b.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 |