From 1e7a52005b6bc92f78afee28d7e9792a2d3dfc46 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 24 Sep 2020 13:12:10 +0200
Subject: [PATCH] QStaticPlugin: Reorder class members

Address ### Qt6 comment.

Task-number: QTBUG-85700
Change-Id: I31b65a76662b3dcdfa1400a3747c2e3c730b5ee3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/corelib/plugin/qplugin.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 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;
-private:
-    // ### Qt 6: revise, as this is not standard-layout
-    const void *rawMetaData;
-    qsizetype rawMetaDataSize;
-public:
     QJsonObject metaData() const;
+
+private:
+    qsizetype rawMetaDataSize;
+    const void *rawMetaData;
 };
 Q_DECLARE_TYPEINFO(QStaticPlugin, Q_PRIMITIVE_TYPE);