AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStaticPlugin: Reorder class members

Browse Source 
Address ### Qt6 comment.

Task-number: QTBUG-85700
Change-Id: I31b65a76662b3dcdfa1400a3747c2e3c730b5ee3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-24 13:12:10 +02:00
parent 51e138b695
commit 1e7a52005b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/plugin/qplugin.h
View File

@ -84,15 +84,14 @@ struct Q_CORE_EXPORT QStaticPlugin
{ {
public: public:
constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m) constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m)
: instance(i), rawMetaData(m().data), rawMetaDataSize(m().size) : instance(i), rawMetaDataSize(m().size), rawMetaData(m().data)
{} {}
QtPluginInstanceFunction instance; QtPluginInstanceFunction instance;
private:
// ### Qt 6: revise, as this is not standard-layout
const void *rawMetaData;
qsizetype rawMetaDataSize;
public:
QJsonObject metaData() const; QJsonObject metaData() const;
private:
qsizetype rawMetaDataSize;
const void *rawMetaData;
}; };
Q_DECLARE_TYPEINFO(QStaticPlugin, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(QStaticPlugin, Q_PRIMITIVE_TYPE);