summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/qplugin.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/plugin/qplugin.h')
-rw-r--r--src/corelib/plugin/qplugin.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h
index c03eb57f1de..d768ae0736e 100644
--- a/src/corelib/plugin/qplugin.h
+++ b/src/corelib/plugin/qplugin.h
@@ -84,15 +84,14 @@ struct Q_CORE_EXPORT QStaticPlugin
{
public:
constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m)
- : instance(i), rawMetaData(m().data), rawMetaDataSize(m().size)
+ : instance(i), rawMetaDataSize(m().size), rawMetaData(m().data)
{}
QtPluginInstanceFunction instance;
+ QJsonObject metaData() const;
+
private:
- // ### Qt 6: revise, as this is not standard-layout
- const void *rawMetaData;
qsizetype rawMetaDataSize;
-public:
- QJsonObject metaData() const;
+ const void *rawMetaData;
};
Q_DECLARE_TYPEINFO(QStaticPlugin, Q_PRIMITIVE_TYPE);