diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 17:45:41 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 17:45:41 (GMT) |
| commit | 615972e09981a0916422716b4f6572c6401789da (patch) | |
| tree | 82203c15bceebd5426c823852ef5c85ad025e92b /src/corelib/tools/qstring.h | |
| parent | 60fd302e8d88b92ade59d68872c99310128c3a6c (diff) | |
| parent | de4332a4728e739b37e9c7b04c021e150e096270 (diff) | |
| download | Qt-615972e09981a0916422716b4f6572c6401789da.zip Qt-615972e09981a0916422716b4f6572c6401789da.tar.gz Qt-615972e09981a0916422716b4f6572c6401789da.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 5e3b0fd..8de3c7d 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -91,7 +91,8 @@ class Q_CORE_EXPORT QString { public: inline QString(); - QString(const QChar *unicode, int size); + QString(const QChar *unicode, int size); // Qt5: don't cap size < 0 + explicit QString(const QChar *unicode); // Qt5: merge with the above QString(QChar c); QString(int size, QChar c); inline QString(const QLatin1String &latin1); @@ -595,7 +596,7 @@ private: struct Data { QBasicAtomicInt ref; int alloc, size; - ushort *data; + ushort *data; // QT5: put that after the bit field to fill alignment gap; don't use sizeof any more then ushort clean : 1; ushort simpletext : 1; ushort righttoleft : 1; |