summaryrefslogtreecommitdiff
path: root/tests/auto/tools/moc
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2019-04-30 14:13:22 +0200
committerLars Knoll <lars.knoll@qt.io>2019-05-05 17:34:57 +0000
commit08101b2b27f7f2177993ddb62c15187c169ccd19 (patch)
treeb2cb4ccbacc070c2aeb58d679298db90bc27812b /tests/auto/tools/moc
parent82ddecfb17158c35de1d0740dd7ecd5562d41726 (diff)
downloadqtbase-08101b2b27f7f2177993ddb62c15187c169ccd19.tar.gz
Fix qplugin.h for Qt 6
Change-Id: I3ae6594a2982f990a5b3851a063b0b2f02d16bd9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/tools/moc')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index f12df578f4..6b7aaf7c0a 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1425,6 +1425,16 @@ void tst_Moc::environmentIncludePaths()
// plugin_metadata.h contains a plugin which we register here. Since we're not building this
// application as a plugin, we need top copy some of the initializer code found in qplugin.h:
extern "C" QObject *qt_plugin_instance();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+extern "C" QPluginMetaData qt_plugin_query_metadata();
+class StaticPluginInstance{
+public:
+ StaticPluginInstance() {
+ QStaticPlugin plugin(qt_plugin_instance, qt_plugin_query_metadata);
+ qRegisterStaticPluginFunction(plugin);
+ }
+};
+#else
extern "C" const char *qt_plugin_query_metadata();
class StaticPluginInstance{
public:
@@ -1433,6 +1443,7 @@ public:
qRegisterStaticPluginFunction(plugin);
}
};
+#endif
static StaticPluginInstance staticInstance;
void tst_Moc::specifyMetaTagsFromCmdline() {