diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-21 10:05:15 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-23 07:49:36 (GMT) |
| commit | 1ec8acd77b6c048f5a68887ac7750b0764ade598 (patch) | |
| tree | 8b932e3b11e8b063607f80b6f0c042b4b04bafa8 | |
| parent | e06bc69870d1ef79466557dd716ec1edb0e48fee (diff) | |
| download | Qt-1ec8acd77b6c048f5a68887ac7750b0764ade598.zip Qt-1ec8acd77b6c048f5a68887ac7750b0764ade598.tar.gz Qt-1ec8acd77b6c048f5a68887ac7750b0764ade598.tar.bz2 | |
Remove Q_PACKED from QChar and QLocale::Data.
Reviewed-by: Olivier Goffart
| -rw-r--r-- | dist/changes-4.7.0 | 7 | ||||
| -rw-r--r-- | src/corelib/tools/qchar.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale.h | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0 index 34d002c..4965ef5 100644 --- a/dist/changes-4.7.0 +++ b/dist/changes-4.7.0 @@ -333,3 +333,10 @@ QtScript: Changes due to updating src/3rdparty/javascriptcore: a column number of 1. - QScriptValueIterator will include the "length" property when iterating over Array objects. + +QtCore: + - QChar no longer carries the Q_PACKED tag on ARM. This flag was + used to allow proper alignment of QChar on 2 bytes on older ARM + ABIs, but it also allowed for unaligned access. Qt never generates + or uses unaligned access and the new EABI aligns as expected, so + the flag was removed. diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 205f911..b9e7e01 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -358,11 +358,7 @@ private: QChar(uchar c); #endif ushort ucs; -} -#if (defined(__arm__) || defined(__ARMEL__)) - 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 5023201..f2fd892 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -685,11 +685,7 @@ public: struct Data { quint16 index; quint16 numberOptions; - } -#if (defined(__arm__) || defined(__ARMEL__)) - Q_PACKED -#endif - ; + }; private: friend struct QLocalePrivate; // ### We now use this field to pack an index into locale_data and NumberOptions. |