QPlugin: add qt_plugin_query_metadata_v2() to dynamic plugins

They return a pointer to the actual header, skipping the magic string.
This is done in preparation for the header located in an ELF note, which
won't have the magic.

Change-Id: I3eb1bd30e0124f89a052fffd16a8229bec2ad588
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 3 insertions, 12 deletions

diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index e55fbf2137..ec7f7dc0dc 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -1021,7 +1021,7 @@ void tst_QGuiApplication::genericPluginsAndWindowSystemEvents()
     QCoreApplication::postEvent(&testReceiver, new QEvent(QEvent::User));
     QCOMPARE(testReceiver.customEvents, 0);
 
-    QStaticPlugin testPluginInfo(qt_plugin_instance, qt_plugin_query_metadata);
+    QStaticPlugin testPluginInfo(qt_plugin_instance, qt_plugin_query_metadata_v2);
     qRegisterStaticPluginFunction(testPluginInfo);
     int argc = 3;
     char *argv[] = { const_cast<char*>(QTest::currentAppName()), const_cast<char*>("-plugin"), const_cast<char*>("testplugin") };
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 6776b6e509..cd69ea893c 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1468,20 +1468,11 @@ 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();
-extern "C" QPluginMetaData qt_plugin_query_metadata();
+extern "C" QPluginMetaData qt_plugin_query_metadata_v2();
 class StaticPluginInstance{
 public:
     StaticPluginInstance() {
-        decltype(&qt_plugin_query_metadata) queryFn;
-        queryFn = []() {
-            // Static plugins don't carry the magic string (since Qt 6.3)
-            QPluginMetaData md = qt_plugin_query_metadata();
-            int delta = sizeof(QPluginMetaData::MagicString);
-            md.data = static_cast<const char *>(md.data) + delta;
-            md.size -= delta;
-            return md;
-        };
-        QStaticPlugin plugin(qt_plugin_instance, queryFn);
+        QStaticPlugin plugin(qt_plugin_instance, qt_plugin_query_metadata_v2);
         qRegisterStaticPluginFunction(plugin);
     }
 };