diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-01 08:32:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-01 08:34:29 (GMT) |
| commit | e58293b3b0cb4664efca10229ae2e6556185e8a7 (patch) | |
| tree | 47c245bef2cdc2ac7a09de1bd136bc03c3cf849b /src/corelib/io | |
| parent | d6cb9ed0b44118c7f9045559a300ea14985f0103 (diff) | |
| download | Qt-e58293b3b0cb4664efca10229ae2e6556185e8a7.zip Qt-e58293b3b0cb4664efca10229ae2e6556185e8a7.tar.gz Qt-e58293b3b0cb4664efca10229ae2e6556185e8a7.tar.bz2 | |
Compilation with pedantic or when QtCore is not specified in the include path
Note that i also removed the #error since the enum is already updated in master
Reviewed-by: Gabi
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdatastream.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 6e83204..7cf22f2 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -84,11 +84,7 @@ public: Qt_4_3 = 9, 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 + Qt_4_6 = 12 }; enum ByteOrder { |