diff options
| -rw-r--r-- | src/corelib/tools/qchar.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale.h | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 953f3a048c..cfa1ccc07b 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -360,7 +360,11 @@ private: QChar(uchar c); #endif ushort ucs; -}; +} +#if (defined(__arm__) && defined(QT_NO_ARM_EABI)) + Q_PACKED +#endif +; Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE); diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 620223668a..b19d847a17 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -786,7 +786,12 @@ public: struct Data { quint16 index; quint16 numberOptions; - }; + } +#if (defined(__arm__) || defined(QT_NO_ARM_EABI)) + Q_PACKED +#endif + ; + private: friend struct QLocalePrivate; // ### We now use this field to pack an index into locale_data and NumberOptions. |