diff options
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 413eca8a68..af0742d2c6 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -76,8 +76,7 @@ struct QQmlVMEMetaData short aliasCount; short signalCount; short methodCount; - short dummyForAlignment; // Add padding to ensure that the following - // AliasData/PropertyData/MethodData is int aligned. + // Make sure this structure is always aligned to int struct AliasData { int contextIdx; diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index f1e12a0c00..1f299c0dbb 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -247,6 +247,8 @@ private slots: void earlyIdObjectAccess(); + void dataAlignment(); + private: QQmlEngine engine; QStringList defaultImportPathList; @@ -4079,6 +4081,14 @@ void tst_qqmllanguage::earlyIdObjectAccess() QVERIFY(o->property("success").toBool()); } +void tst_qqmllanguage::dataAlignment() +{ + QVERIFY(sizeof(QQmlVMEMetaData) % sizeof(int) == 0); + QVERIFY(sizeof(QQmlVMEMetaData::AliasData) % sizeof(int) == 0); + QVERIFY(sizeof(QQmlVMEMetaData::PropertyData) % sizeof(int) == 0); + QVERIFY(sizeof(QQmlVMEMetaData::MethodData) % sizeof(int) == 0); +} + QTEST_MAIN(tst_qqmllanguage) #include "tst_qqmllanguage.moc" |