4 files changed, 21 insertions, 23 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 42ccffc..fef77d8 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -131,7 +131,7 @@ struct QAxMetaObject : public QMetaObject
     ~QAxMetaObject()
     {
         delete [] d.data;
-        delete [] reinterpret_cast<char *>(const_cast<QByteArrayData *>(d.stringdata));
+        delete [] reinterpret_cast<char *>(const_cast<uint *>(d.stringdata));
     }
 
     int numParameter(const QByteArray &prototype);
@@ -3162,7 +3162,7 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
     // put the metaobject together
     metaobj->d.data = int_data;
     metaobj->d.extradata = nullptr;
-    metaobj->d.stringdata = reinterpret_cast<const QByteArrayData *>(string_data);
+    metaobj->d.stringdata = reinterpret_cast<const uint *>(string_data);
     metaobj->d.static_metacall = nullptr;
     metaobj->d.relatedMetaObjects = nullptr;
     metaobj->d.superdata = parentObject;
@@ -3188,26 +3188,24 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
     return metaobj;
 }
 
-#define QT_MOC_LITERAL(idx, ofs, len) { \
-    Q_REFCOUNT_INITIALIZE_STATIC, len, 0, 0, \
-    offsetof(qt_meta_stringdata_QAxBase_t, stringdata) + ofs \
-        - idx * sizeof(QByteArrayData) \
-    }
+#define QT_MOC_LITERAL(ofs, len) \
+    uint(offsetof(qt_meta_stringdata_QAxBase_t, stringdata) + ofs), len
+
 const QAxBase::qt_meta_stringdata_QAxBase_t QAxBase::qt_meta_stringdata_QAxBase = {
     {
-QT_MOC_LITERAL(0, 0, 7),
-QT_MOC_LITERAL(1, 8, 6),
-QT_MOC_LITERAL(2, 15, 0),
-QT_MOC_LITERAL(3, 16, 4),
-QT_MOC_LITERAL(4, 21, 4),
-QT_MOC_LITERAL(5, 26, 4),
-QT_MOC_LITERAL(6, 31, 15),
-QT_MOC_LITERAL(7, 47, 9),
-QT_MOC_LITERAL(8, 57, 4),
-QT_MOC_LITERAL(9, 62, 6),
-QT_MOC_LITERAL(10, 69, 4),
-QT_MOC_LITERAL(11, 74, 4),
-QT_MOC_LITERAL(12, 79, 7)
+QT_MOC_LITERAL(0, 7),
+QT_MOC_LITERAL(8, 6),
+QT_MOC_LITERAL(15, 0),
+QT_MOC_LITERAL(16, 4),
+QT_MOC_LITERAL(21, 4),
+QT_MOC_LITERAL(26, 4),
+QT_MOC_LITERAL(31, 15),
+QT_MOC_LITERAL(47, 9),
+QT_MOC_LITERAL(57, 4),
+QT_MOC_LITERAL(62, 6),
+QT_MOC_LITERAL(69, 4),
+QT_MOC_LITERAL(74, 4),
+QT_MOC_LITERAL(79, 7)
     },
     "QAxBase\0signal\0\0name\0argc\0argv\0"
     "propertyChanged\0exception\0code\0source\0"
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h
index 38dec7e..3882092 100644
--- a/src/activeqt/container/qaxbase.h
+++ b/src/activeqt/container/qaxbase.h
@@ -159,7 +159,7 @@ protected:
     virtual const QMetaObject *fallbackMetaObject() const = 0;
 
     struct qt_meta_stringdata_QAxBase_t {
-        QByteArrayData data[13];
+        const uint offsetsAndSize[26];
         char stringdata[88];
     };
     static const qt_meta_stringdata_QAxBase_t qt_meta_stringdata_QAxBase;
diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp
index 97a995d..8f309b3 100644
--- a/src/activeqt/container/qaxobject.cpp
+++ b/src/activeqt/container/qaxobject.cpp
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
 */
 
 const QMetaObject QAxObject::staticMetaObject = {
-    { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase.data,
+    { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase.offsetsAndSize,
       qt_meta_data_QAxBase, qt_static_metacall, nullptr, nullptr }
 };
 
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 69875d2..1512fe1 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1914,7 +1914,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
 */
 
 const QMetaObject QAxWidget::staticMetaObject = {
-    { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase.data,
+    { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase.offsetsAndSize,
       qt_meta_data_QAxBase, qt_static_metacall, nullptr, nullptr }
 };