diff options
| author | Thiago Macieira <thiago@kde.org> | 2011-07-08 15:49:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-11 14:17:33 +0200 |
| commit | 0c0676ada2cc3943d09f8eb1e75491b80f08f27b (patch) | |
| tree | 3e63dd46cb484b0b35ff47d909c246db279ca763 /src | |
| parent | 06f2c9da46b578b57f9baa9167946d77cd653914 (diff) | |
Remove #ifdef for platforms where QChar was packed -- there aren't any
On ARM OABI, sizeof(QChar) was 4, so we used to pack it so QChar[] was
isomorphic to ushort[]. We don't support the OABI anymore and the EABI
does the right thing.
Change-Id: I181dd2f169f6868450302e269ef9ad5d643f306f
Merge-request: 13
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1386
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qchar.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index cd30dace09..d6db72d5ac 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -228,11 +228,7 @@ public: char toAscii() const; inline char toLatin1() const; inline ushort unicode() const { return ucs; } -#ifdef Q_NO_PACKED_REFERENCE - inline ushort &unicode() { return const_cast<ushort&>(ucs); } -#else inline ushort &unicode() { return ucs; } -#endif static QChar fromAscii(char c); static QChar fromLatin1(char c); |