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/io/qdatastream.cpp | |
| 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/io/qdatastream.cpp')
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 19e86a6..b10d603 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -42,7 +42,7 @@ #include "qdatastream.h" #include "qdatastream_p.h" -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) #include "qbuffer.h" #include "qstring.h" #include <stdio.h> |