summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-06 08:47:34 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-07 02:32:11 (GMT)
commit5bab2186dd61a4cab97c81e4ce5a71a4e7acca07 (patch)
tree0f254b35202d3daafb940901c1ce04b97a15658d
parent2065122db7a12a133f082cb21582c9a853dddd2d (diff)
downloadQt-5bab2186dd61a4cab97c81e4ce5a71a4e7acca07.zip
Qt-5bab2186dd61a4cab97c81e4ce5a71a4e7acca07.tar.gz
Qt-5bab2186dd61a4cab97c81e4ce5a71a4e7acca07.tar.bz2
Partially revert e58293b3b, re-adding the #ifdef for Qt 4.7
(cherry picked from commit f1ea73bad48816222e192a95f8589493743f0c28)
-rw-r--r--src/corelib/io/qdatastream.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 7cf22f2..f61a59c 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -85,6 +85,10 @@ public:
Qt_4_4 = 10,
Qt_4_5 = 11,
Qt_4_6 = 12
+#if QT_VERSION >= 0x040700
+#error Add the datastream version for this Qt version
+ Qt_4_7 = Qt_4_6
+#endif
};
enum ByteOrder {