diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-09 15:57:09 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 12:57:40 (GMT) |
| commit | 006b41c8dd76d6ee33af5459339742fcae2b680f (patch) | |
| tree | 6f5adf4944ce49d434709c164d23a7944de3d067 /src/corelib/io | |
| parent | 87c019c75d12c19f5643d55d26f6cbcaf0852082 (diff) | |
| download | Qt-006b41c8dd76d6ee33af5459339742fcae2b680f.zip Qt-006b41c8dd76d6ee33af5459339742fcae2b680f.tar.gz Qt-006b41c8dd76d6ee33af5459339742fcae2b680f.tar.bz2 | |
build lrelease bootstrapped
needed for build-time qm generation in qt itself.
the downsides are a) that the other bootstrapped tools grow by ~12kB
(on x86) due to qdatastream being pulled in by qbytearray and qstring
and b) that lrelease isn't l10n'd itself anymore (the latter could be
fixed by building a non-qobject qtranslator).
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream_p.h | 2 |
3 files changed, 3 insertions, 3 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> diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index f61a59c..2e4e7c1 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -66,7 +66,7 @@ template <typename T> class QSet; template <class Key, class T> class QHash; template <class Key, class T> class QMap; -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) class QDataStreamPrivate; class Q_CORE_EXPORT QDataStream { diff --git a/src/corelib/io/qdatastream_p.h b/src/corelib/io/qdatastream_p.h index 157fee9..98dd21f 100644 --- a/src/corelib/io/qdatastream_p.h +++ b/src/corelib/io/qdatastream_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) class QDataStreamPrivate { public: |