diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 12:13:40 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 12:13:40 (GMT) |
| commit | 508e7eb83ffbab0ddf8f5a5c0251df42b01655b2 (patch) | |
| tree | d26a328e593a957dfd54b1ad06b6fd5121da6f4e /src/corelib/tools/qstring.h | |
| parent | 3286c4d489905d27183a9ba18048c11a5af8913c (diff) | |
| download | Qt-508e7eb83ffbab0ddf8f5a5c0251df42b01655b2.zip Qt-508e7eb83ffbab0ddf8f5a5c0251df42b01655b2.tar.gz Qt-508e7eb83ffbab0ddf8f5a5c0251df42b01655b2.tar.bz2 | |
do not (fail to) compile qdatastream into qmake and cetest
for some reason, this did build on linux and windows, but symbian seems
somewhat stricter.
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 55d6d03..668be35 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1065,7 +1065,7 @@ inline QChar &QString::ref(uint i) } #endif -#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) +#if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE)) Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QString &); Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QString &); #endif |