summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-04-22 07:00:51 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-04-22 07:00:51 (GMT)
commit59289f8ca93fd10def7227b298013a0a988e664c (patch)
treebe028f536c92e6981ff97a6d258e312e79d0ec46 /src/corelib/io
parent1b3ddbf73ac4db4aa4a6cea4f09dc04644d03ca7 (diff)
downloadQt-59289f8ca93fd10def7227b298013a0a988e664c.zip
Qt-59289f8ca93fd10def7227b298013a0a988e664c.tar.gz
Qt-59289f8ca93fd10def7227b298013a0a988e664c.tar.bz2
Revert "Add new QDataStream version for Qt 4.8."
This reverts commit 1b3ddbf73ac4db4aa4a6cea4f09dc04644d03ca7.
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qdatastream.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 774c4bc..222ba8f 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -85,11 +85,10 @@ public:
Qt_4_4 = 10,
Qt_4_5 = 11,
Qt_4_6 = 12,
- Qt_4_7 = Qt_4_6,
- Qt_4_8 = Qt_4_7
-#if QT_VERSION >= 0x040900
+ Qt_4_7 = Qt_4_6
+#if QT_VERSION >= 0x040800
#error Add the datastream version for this Qt version
- Qt_4_9 = Qt_4_8
+ Qt_4_8 = Qt_4_7
#endif
};