diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-08-27 10:09:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-08-27 16:44:24 +0200 |
| commit | 92ae89a2f7aee0c857062ada2a82af55e9153070 (patch) | |
| tree | 7105357ae8cc81ffcf14cde49306b2f006f6bcac /src/plugins/scanner | |
| parent | 33a91f7af18d8703cc63ef640d24b417a9e3cdf2 (diff) | |
AutoMoc: do not scan files twice
We scanned files for the Q_OBJECT macro and then again to find
moc_XXX.cpp includes. This can be done in one pass.
Change-Id: I3b14be2a922ce244730b3ce21e7803c605ba59be
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/plugins/scanner')
| -rw-r--r-- | src/plugins/scanner/cpp/cppscanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index ede98cb0e..0aa774561 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -154,7 +154,7 @@ static void scanCppFile(void *opaq, Lexer &yylex, bool scanForFileTags, bool sca { opaque->hasPluginMetaDataMacro = true; } - if (opaque->hasQObjectMacro + if (!scanForDependencies && opaque->hasQObjectMacro && (opaque->fileType == Opaq::FT_CPP || opaque->hasPluginMetaDataMacro)) break; } |