diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-30 11:17:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-30 09:35:01 +0000 |
| commit | 6204e140bd32afa90be334400fb13083bd6ee5d3 (patch) | |
| tree | 4bb98f57ec5dabc7b22d31e094973138b400bbb5 /src/lib/corelib/buildgraph/qtmocscanner.h | |
| parent | 891ca70dc7d92c2b59e33e58d0c907db913308d3 (diff) | |
QtMocScanner: Hold only one C++ scanner instance
In commit 21e82bbbe3, we merged the different C/C++ include scanners,
but forgot to adapt the moc scanner, which still operated under the
assumption that it needed to hold different instances per file tag.
Change-Id: I3cdce3969aa443ca0f2b436c9cb8a6847998d4d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/qtmocscanner.h')
| -rw-r--r-- | src/lib/corelib/buildgraph/qtmocscanner.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/corelib/buildgraph/qtmocscanner.h b/src/lib/corelib/buildgraph/qtmocscanner.h index 9b0a00f31..6455383f3 100644 --- a/src/lib/corelib/buildgraph/qtmocscanner.h +++ b/src/lib/corelib/buildgraph/qtmocscanner.h @@ -66,7 +66,6 @@ public: ~QtMocScanner(); private: - ScannerPlugin *scannerPluginForFileTags(const FileTags &ft); void findIncludedMocCppFiles(); static QScriptValue js_apply(QScriptContext *ctx, QScriptEngine *engine, QtMocScanner *that); QScriptValue apply(QScriptEngine *engine, const Artifact *artifact); @@ -75,9 +74,7 @@ private: const ResolvedProductPtr &m_product; QScriptValue m_targetScriptValue; QHash<QString, QString> m_includedMocCppFiles; - ScannerPlugin *m_cppScanner; - ScannerPlugin *m_objcppScanner; - ScannerPlugin *m_hppScanner; + ScannerPlugin *m_cppScanner = nullptr; }; } // namespace Internal |