diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /qmake/library/qmakeparser.h | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'qmake/library/qmakeparser.h')
| -rw-r--r-- | qmake/library/qmakeparser.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h index 6557ad65b5..a29e9c227d 100644 --- a/qmake/library/qmakeparser.h +++ b/qmake/library/qmakeparser.h @@ -78,7 +78,6 @@ public: enum ParseFlag { ParseDefault = 0, ParseUseCache = 1, - ParseOnlyCached = 2, ParseReportMissing = 4 }; Q_DECLARE_FLAGS(ParseFlags, ParseFlag) @@ -91,6 +90,8 @@ public: ProFile *parsedProBlock(const QStringRef &contents, const QString &name, int line = 0, SubGrammar grammar = FullGrammar); + int idForFileName(const QString &fileName); + void discardFileFromCache(const QString &fileName); #ifdef PROPARSER_DEBUG @@ -181,6 +182,12 @@ private: QString m_tmp; // Temporary for efficient toQString + QHash<QString, int> fileIdMap; +#ifdef PROEVALUATOR_THREAD_SAFE + QMutex fileIdMutex; +#endif + int fileIdCounter = 0; + ProFileCache *m_cache; QMakeParserHandler *m_handler; QMakeVfs *m_vfs; |