qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt qqmlmoduleplugin test to new metadata format 

Fixes: QTBUG-97605
Change-Id: I73263048001f99a91e6d634dae1003ea17c86758
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2021-10-19 07:51:26 +02:00
parent 6f94324279
commit cde9071322
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
View File

@ -151,9 +151,7 @@ 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(QByteArrayLiteral("QTMETADATA !"));
PluginType::metaData.append(char(0)); // current version
PluginType::metaData.append(char(1)); // current version
PluginType::metaData.append(char(QT_VERSION_MAJOR));
PluginType::metaData.append(char(QT_VERSION_MINOR));
PluginType::metaData.append(char(qPluginArchRequirements()));
@ -163,16 +161,6 @@ void registerStaticPlugin(const char *uri)
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);
};