summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qchar.h6
-rw-r--r--src/corelib/tools/qlocale.h7
2 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index 953f3a0..cfa1ccc 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 6202236..b19d847 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.