diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-24 19:28:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 22:55:59 +0200 |
| commit | 0a1faaa9eb7807bf11d796c2eca624e2f3b378a7 (patch) | |
| tree | 9852be17658bccce6395b805c5b58dfeb544024a /qmake/library/qmakeparser.h | |
| parent | 725bdc3fd2f88c7f49f59a151579fd128cf543dc (diff) | |
avoid boolean argument trap: introduce QMakeParser::ParseFlag
Change-Id: I26ce032a1aa044e9a4da0c8708a4490b07374992
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/066b08fc62c67d586996ea4e272ef05dd3865fac)
(cherry picked from qttools/226f013441990aa4a58f7c82e284057cff659959)
Diffstat (limited to 'qmake/library/qmakeparser.h')
| -rw-r--r-- | qmake/library/qmakeparser.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h index e3da05cc9e..e9b0b76b3c 100644 --- a/qmake/library/qmakeparser.h +++ b/qmake/library/qmakeparser.h @@ -87,11 +87,17 @@ public: // Call this from a concurrency-free context static void initialize(); + enum ParseFlag { + ParseDefault = 0, + ParseUseCache = 1 + }; + Q_DECLARE_FLAGS(ParseFlags, ParseFlag) + QMakeParser(ProFileCache *cache, QMakeVfs *vfs, QMakeParserHandler *handler); enum SubGrammar { FullGrammar, TestGrammar, ValueGrammar }; // fileName is expected to be absolute and cleanPath()ed. - ProFile *parsedProFile(const QString &fileName, bool cache = false); + ProFile *parsedProFile(const QString &fileName, ParseFlags flags = ParseDefault); ProFile *parsedProBlock(const QString &contents, const QString &name, int line = 0, SubGrammar grammar = FullGrammar); @@ -184,6 +190,8 @@ private: friend class ProFileCache; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeParser::ParseFlags) + class QMAKE_EXPORT ProFileCache { public: |