Bump the datastream version for Qt 6
We don't support obsoleted QMatrix type anymore. Change-Id: Id412510aa1ad08d6e89a73da3317152e6dfa8f57 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
3673ee9823
commit
543e87c65a
@ -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
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user