diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:13:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:13:15 (GMT) |
| commit | 398d37e78d0026b832e1676de9bd33b5441bfd9e (patch) | |
| tree | 69cfa40370d5b837ac310a463f898471fa949f3a /src/corelib/tools/qbytearray.h | |
| parent | bfe06c2531fa47d4d417ec22bdb184b06ad0f073 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
| download | Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.zip Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.gz Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index e258481..7dd6f4f 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -572,7 +572,7 @@ inline QByteArray &QByteArray::setNum(float n, char f, int prec) { return setNum(double(n),f,prec); } -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE)) Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QByteArray &); Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &); #endif |