diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 11:04:24 (GMT) |
| commit | 4d33c51bf00be826b8036f58cd9aea0c1f44f8ce (patch) | |
| tree | 99339183e160058b996580157d8ed89bd6809562 /src/corelib/io/qdatastream.h | |
| parent | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (diff) | |
| parent | b0e6c5ca48c76fb17dca986e9e07adebde390e29 (diff) | |
| download | Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.zip Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.gz Qt-4d33c51bf00be826b8036f58cd9aea0c1f44f8ce.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
tools/assistant/translations/translations_adp.pro
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
translations/assistant_adp_de.ts
Diffstat (limited to 'src/corelib/io/qdatastream.h')
| -rw-r--r-- | src/corelib/io/qdatastream.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index f8e0608..f2efcd3 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -84,12 +84,10 @@ public: Qt_4_3 = 9, Qt_4_4 = 10, Qt_4_5 = 11, - Qt_4_6 = 12, - Qt_4_7 = Qt_4_6 + Qt_4_6 = 12 #if QT_VERSION >= 0x040800 #error Add the datastream version for this Qt version Qt_4_8 = Qt_4_7 -#endif }; enum ByteOrder { |