diff options
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 270267e29e..c7b0008039 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -95,15 +95,9 @@ public: Qt_5_12 = 18, Qt_5_13 = 19, Qt_5_14 = Qt_5_13, -#if QT_VERSION >= 0x050f00 Qt_5_15 = Qt_5_14, - Qt_DefaultCompiledVersion = Qt_5_15 -#elif QT_VERSION >= 0x060000 - Qt_6_0 = Qt_5_15, + Qt_6_0 = 20, Qt_DefaultCompiledVersion = Qt_6_0 -#else - Qt_DefaultCompiledVersion = Qt_5_14 -#endif #if QT_VERSION >= 0x060100 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 75bfadb200..5fc4343cd9 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -302,7 +302,8 @@ static int NColorRoles[] = { QPalette::ToolTipText + 1, // Qt_5_4, Qt_5_5 QPalette::ToolTipText + 1, // Qt_5_6, Qt_5_7, Qt_5_8, Qt_5_9, Qt_5_10, Qt_5_11 QPalette::PlaceholderText + 1, // Qt_5_12 - QPalette::PlaceholderText + 1, // Qt_5_13 + QPalette::PlaceholderText + 1, // Qt_5_13, Qt_5_14, Qt_5_15 + QPalette::PlaceholderText + 1, // Qt_6_0 0 // add the correct value for Qt_5_14 here later }; |