diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:55:45 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:55:57 (GMT) |
| commit | 8415ced03461fa4d3d9f915da0251760bd0a7202 (patch) | |
| tree | f960fd9827f85434053559f7d59e0afb528bf9ce /src/corelib/tools/qbytearray.cpp | |
| parent | 132a42c28e35ac69a5af8c2b7d478b86e92b87e4 (diff) | |
| parent | 80dfb33cc5fec8fd19e78a959e02588ce58736ee (diff) | |
| download | Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.zip Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.tar.gz Qt-8415ced03461fa4d3d9f915da0251760bd0a7202.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index d8557e5..bf9b6bd 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -48,9 +48,7 @@ #include "qlocale_p.h" #include "qunicodetables_p.h" #include "qscopedpointer.h" -#ifndef QT_NO_DATASTREAM #include <qdatastream.h> -#endif #ifndef QT_NO_COMPRESS #include <zlib.h> @@ -2640,7 +2638,7 @@ void QByteArray::clear() d->ref.ref(); } -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE)) /*! \relates QByteArray |