diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-24 13:12:10 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-25 17:02:51 +0200 |
| commit | 1e7a52005b6bc92f78afee28d7e9792a2d3dfc46 (patch) | |
| tree | eb3bb0b6d760c37dece28bf1cdb98d7a21fc87dc /src/corelib/plugin | |
| parent | 51e138b6958bd5911a5c354c2bed25aae5c75759 (diff) | |
QStaticPlugin: Reorder class members
Address ### Qt6 comment.
Task-number: QTBUG-85700
Change-Id: I31b65a76662b3dcdfa1400a3747c2e3c730b5ee3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qplugin.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index c03eb57f1d..d768ae0736 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); |