diff options
| author | Andy Shaw <qt-info@nokia.com> | 2009-10-20 18:24:44 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2009-10-20 18:24:44 (GMT) |
| commit | 1315bcdd1e2add0ce26f0cb9a4d2a95477434315 (patch) | |
| tree | 20e6192aa231511944d319cc99108f0cc821c8f2 /qmake/generators/metamakefile.h | |
| parent | 613866eb719e35fa2459cb12d46315ca9dcefa62 (diff) | |
| download | Qt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.zip Qt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.tar.gz Qt-1315bcdd1e2add0ce26f0cb9a4d2a95477434315.tar.bz2 | |
Ensure qmake does not lose the error code when going over the subdirs
When qmake was ran with -r over a subdirs project then it would lose the
error code if a later project succeeded.
This is a refix of the previous revert which has been confirmed to work
all over the place now.
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'qmake/generators/metamakefile.h')
| -rw-r--r-- | qmake/generators/metamakefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h index e69304a..f74f4a2 100644 --- a/qmake/generators/metamakefile.h +++ b/qmake/generators/metamakefile.h @@ -62,7 +62,7 @@ public: virtual ~MetaMakefileGenerator(); - static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true); + static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0); static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false); inline QMakeProject *projectFile() const { return project; } |