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>bb10
parent
06f2c9da46
commit
0c0676ada2
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue