Merge remote-tracking branch 'origin/wip/qt6' into dev

Change-Id: I10c4b7fcfa0397d999d45e310c2f8f051d57d4d2

3 files changed, 23 insertions, 2 deletions

diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
index b13b2004c2..ba6bb3d7ac 100644
--- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
+++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml
@@ -1,5 +1,6 @@
 import org.qtproject.AutoTestQmlMixedPluginType 1.5
 import QtQuick 2.0
+import QtQml 2.0
 
 Item {
     property bool test: false
diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
index 563c0b28e3..f1268075c1 100644
--- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
+++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml
@@ -1,5 +1,6 @@
 import org.qtproject.AutoTestQmlMixedPluginType 1.0
 import QtQuick 2.0
+import QtQml 2.0
 
 Item {
     property bool test: false
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index f89cc9f24a..a3d1858d6b 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -34,6 +34,10 @@
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonarray.h>
 #include <QDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QCborMap>
+#include <QCborValue>
+#endif
 
 #if defined(Q_OS_MAC)
 // For _PC_CASE_SENSITIVE
@@ -131,8 +135,7 @@ QByteArray SecondStaticPlugin::metaData;
 template <typename PluginType>
 void registerStaticPlugin(const char *uri)
 {
-    QStaticPlugin plugin;
-    plugin.instance = []() {
+    auto instanceFunctor = []() {
         static PluginType plugin;
         return static_cast<QObject*>(&plugin);
     };
@@ -143,12 +146,28 @@ void registerStaticPlugin(const char *uri)
     uris.append(uri);
     md.insert(QStringLiteral("uri"), uris);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    PluginType::metaData.append(QLatin1String("QTMETADATA !"));
+    PluginType::metaData.append(char(0)); // current version
+    PluginType::metaData.append(char(QT_VERSION_MAJOR));
+    PluginType::metaData.append(char(QT_VERSION_MINOR));
+    PluginType::metaData.append(char(qPluginArchRequirements()));
+    PluginType::metaData.append(QCborValue(QCborMap::fromJsonObject(md)).toCbor());
+
+    auto rawMetaDataFunctor = []() -> QPluginMetaData {
+        return {reinterpret_cast<const uchar *>(PluginType::metaData.constData()), size_t(PluginType::metaData.length())};
+    };
+    QStaticPlugin plugin(instanceFunctor, rawMetaDataFunctor);
+#else
     PluginType::metaData.append(QLatin1String("QTMETADATA  "));
     PluginType::metaData.append(QJsonDocument(md).toBinaryData());
 
+    QStaticPlugin plugin;
+    plugin.instance = instanceFunctor;
     plugin.rawMetaData = []() {
         return PluginType::metaData.constData();
     };
+#endif
     qRegisterStaticPluginFunction(plugin);
 };