diff options
| author | ABBAPOH <ABBAPOH@nextmail.ru> | 2013-12-13 19:12:23 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-13 16:39:38 +0100 |
| commit | 481275bf95128b71a2b70f99142a3e39a3b3507e (patch) | |
| tree | b4fb36f3b278e7f932794debfd4ae42cdb6d4a6d | |
| parent | c4e79ef1f99b5802d78e1d7b68ee086e63a183be (diff) | |
Fix build of the DDS plugin without QDataStream
Change-Id: I854c3bd82f244a6c45d91b08c3f1271538fd536a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/plugins/imageformats/dds/ddsheader.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/dds/ddsheader.h | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/dds/main.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.h | 4 |
5 files changed, 21 insertions, 1 deletions
diff --git a/src/plugins/imageformats/dds/ddsheader.cpp b/src/plugins/imageformats/dds/ddsheader.cpp index f5560be..4190ba9 100644 --- a/src/plugins/imageformats/dds/ddsheader.cpp +++ b/src/plugins/imageformats/dds/ddsheader.cpp @@ -42,6 +42,8 @@ #include "ddsheader.h" +#ifndef QT_NO_DATASTREAM + QT_BEGIN_NAMESPACE QDataStream &operator>>(QDataStream &s, DDSPixelFormat &pixelFormat) @@ -133,3 +135,5 @@ QDataStream &operator<<(QDataStream &s, const DDSHeaderDX10 &header) } QT_END_NAMESPACE + +#endif // QT_NO_DATASTREAM diff --git a/src/plugins/imageformats/dds/ddsheader.h b/src/plugins/imageformats/dds/ddsheader.h index c3f8c0f..7f6df06 100644 --- a/src/plugins/imageformats/dds/ddsheader.h +++ b/src/plugins/imageformats/dds/ddsheader.h @@ -45,6 +45,8 @@ #include <QtCore/QDataStream> +#ifndef QT_NO_DATASTREAM + QT_BEGIN_NAMESPACE enum Format { @@ -229,4 +231,6 @@ QDataStream &operator<<(QDataStream &s, const DDSHeaderDX10 &header); QT_END_NAMESPACE +#endif // QT_NO_DATASTREAM + #endif // DDSHEADER_H diff --git a/src/plugins/imageformats/dds/main.cpp b/src/plugins/imageformats/dds/main.cpp index b01299f..08aab46 100644 --- a/src/plugins/imageformats/dds/main.cpp +++ b/src/plugins/imageformats/dds/main.cpp @@ -42,9 +42,11 @@ #include <QtGui/qimageiohandler.h> +#include "qddshandler.h" + #ifndef QT_NO_IMAGEFORMATPLUGIN -#include "qddshandler.h" +#ifndef QT_NO_DATASTREAM QT_BEGIN_NAMESPACE @@ -86,4 +88,6 @@ QT_END_NAMESPACE #include "main.moc" +#endif // QT_NO_DATASTREAM + #endif // QT_NO_IMAGEFORMATPLUGIN diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index efe435d..2b132b5 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -49,6 +49,8 @@ #include "ddsheader.h" +#ifndef QT_NO_DATASTREAM + QT_BEGIN_NAMESPACE enum Colors { @@ -1433,3 +1435,5 @@ bool QDDSHandler::verifyHeader(const DDSHeader &dds) const } QT_END_NAMESPACE + +#endif // QT_NO_DATASTREAM diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h index 0093327..542bd35 100644 --- a/src/plugins/imageformats/dds/qddshandler.h +++ b/src/plugins/imageformats/dds/qddshandler.h @@ -46,6 +46,8 @@ #include <QtGui/qimageiohandler.h> #include "ddsheader.h" +#ifndef QT_NO_DATASTREAM + QT_BEGIN_NAMESPACE class QDDSHandler : public QImageIOHandler @@ -81,4 +83,6 @@ private: QT_END_NAMESPACE +#endif // QT_NO_DATASTREAM + #endif // QDDSHANDLER_H |