diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-27 15:52:46 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-28 10:03:57 +0000 |
| commit | 9503948fd9195f0d07456e66e4dbf7c781f82ef8 (patch) | |
| tree | 3bca8828a44ab9c6bcc6bfc5c2ef72638033ab5f /src/plugins/scanner | |
| parent | 5ef48dc2396257056fedca94fa359b1d392c33cd (diff) | |
Qt support: Scan also cpp files for Q_PLUGIN_METADATA
For some reason, that was only done for headers.
Change-Id: Ia5d57cb68efdda0e1288fea3bd285e656b24b94b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/scanner')
| -rw-r--r-- | src/plugins/scanner/cpp/cppscanner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 9d9268d30..46d16e2f1 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -180,8 +180,7 @@ static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTag tc.equals(tk, qnamespaceLiteral)) { opaque->hasQObjectMacro = true; - } else if (opaque->fileType == Opaq::FT_HPP - && tc.equals(tk, pluginMetaDataLiteral)) + } else if (tc.equals(tk, pluginMetaDataLiteral)) { opaque->hasPluginMetaDataMacro = true; } @@ -277,6 +276,7 @@ static const char **additionalFileTags(void *opaq, int *size) static const char *thMocCpp[] = { "moc_cpp" }; static const char *thMocHpp[] = { "moc_hpp" }; static const char *thMocPluginHpp[] = { "moc_hpp_plugin" }; + static const char *thMocPluginCpp[] = { "moc_cpp_plugin" }; Opaq *opaque = static_cast<Opaq*>(opaq); if (opaque->hasQObjectMacro) { @@ -284,7 +284,7 @@ static const char **additionalFileTags(void *opaq, int *size) switch (opaque->fileType) { case Opaq::FT_CPP: case Opaq::FT_OBJCPP: - return thMocCpp; + return opaque->hasPluginMetaDataMacro ? thMocPluginCpp : thMocCpp; case Opaq::FT_HPP: return opaque->hasPluginMetaDataMacro ? thMocPluginHpp : thMocHpp; default: |