diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:25 +0200 |
| commit | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (patch) | |
| tree | b563a89475df9afb4f40841ec371be9488d5b1ed /src/corelib/tools/qstring.cpp | |
| parent | 8ce85d74b692392a4ea0785360156f37418cff13 (diff) | |
| parent | 9eb0b09abce28b11e4915fc9c3b3e996eb19cef2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 7a5f9b3614..56dab68f33 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -8507,12 +8507,6 @@ QDataStream &operator<<(QDataStream &out, const QString &str) QDataStream &operator>>(QDataStream &in, QString &str) { -#ifdef QT_QSTRING_UCS_4 -#if defined(Q_CC_GNU) -#warning "operator>> not working properly" -#endif -#endif - if (in.version() == 1) { QByteArray l; in >> l; |