aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-04-27 15:52:46 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-04-28 10:03:57 +0000
commit9503948fd9195f0d07456e66e4dbf7c781f82ef8 (patch)
tree3bca8828a44ab9c6bcc6bfc5c2ef72638033ab5f /src/lib/corelib
parent5ef48dc2396257056fedca94fa359b1d392c33cd (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/lib/corelib')
-rw-r--r--src/lib/corelib/buildgraph/qtmocscanner.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/qtmocscanner.cpp b/src/lib/corelib/buildgraph/qtmocscanner.cpp
index 12ec66436..ccb959a0f 100644
--- a/src/lib/corelib/buildgraph/qtmocscanner.cpp
+++ b/src/lib/corelib/buildgraph/qtmocscanner.cpp
@@ -63,6 +63,7 @@ struct CommonFileTags
const FileTag cpp = "cpp";
const FileTag hpp = "hpp";
const FileTag moc_cpp = "moc_cpp";
+ const FileTag moc_cpp_plugin = "moc_cpp_plugin";
const FileTag moc_hpp_plugin = "moc_hpp_plugin";
const FileTag moc_hpp = "moc_hpp";
const FileTag objcpp = "objcpp";
@@ -255,6 +256,10 @@ QScriptValue QtMocScanner::apply(QScriptEngine *engine, const Artifact *artifact
} else {
if (scanResult.additionalFileTags.contains(m_tags.moc_cpp))
hasQObjectMacro = true;
+ if (scanResult.additionalFileTags.contains(m_tags.moc_cpp_plugin)) {
+ hasQObjectMacro = true;
+ hasPluginMetaDataMacro = true;
+ }
}
}