diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-14 12:25:05 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-16 15:03:53 +0200 |
commit | 2f9a294252ae44defd4d8ae1b3c09d8e36ee0612 (patch) | |
tree | cb5fc9680ca8286ee68fbfe9477244b1ad343f0b /src/widgets/styles | |
parent | e1536e3a86de1dfb834eaba4dddd4a148e6911f9 (diff) |
Reset version of QStyleOption types to 1 for Qt 6
Amends 7ff26c776201141e5be87ce24c3c1b1ee96aefcc and
729f1ab9a0b9fe6ffdefc02df490ec546db38d72.
Change-Id: I7d3cea42318faffc9dee48d51ae9f890bb1e7a56
Fixes: QTBUG-84221
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/widgets/styles')
-rw-r--r-- | src/widgets/styles/qstyleoption.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 38f2c98e38..600db338df 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -127,7 +127,7 @@ class Q_WIDGETS_EXPORT QStyleOptionFrame : public QStyleOption { public: enum StyleOptionType { Type = SO_Frame }; - enum StyleOptionVersion { Version = 3 }; + enum StyleOptionVersion { Version = 1 }; int lineWidth; int midLineWidth; @@ -155,7 +155,7 @@ class Q_WIDGETS_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption { public: enum StyleOptionType { Type = SO_TabWidgetFrame }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; int lineWidth; int midLineWidth; @@ -183,7 +183,7 @@ class Q_WIDGETS_EXPORT QStyleOptionTabBarBase : public QStyleOption { public: enum StyleOptionType { Type = SO_TabBarBase }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; QTabBar::Shape shape; QRect tabBarRect; @@ -259,7 +259,7 @@ class Q_WIDGETS_EXPORT QStyleOptionTab : public QStyleOption { public: enum StyleOptionType { Type = SO_Tab }; - enum StyleOptionVersion { Version = 4 }; + enum StyleOptionVersion { Version = 1 }; enum TabPosition { Beginning, Middle, End, OnlyOneTab }; enum SelectedPosition { NotAdjacent, NextIsSelected, PreviousIsSelected }; @@ -328,7 +328,7 @@ class Q_WIDGETS_EXPORT QStyleOptionProgressBar : public QStyleOption { public: enum StyleOptionType { Type = SO_ProgressBar }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; int minimum; int maximum; @@ -381,7 +381,7 @@ class Q_WIDGETS_EXPORT QStyleOptionDockWidget : public QStyleOption { public: enum StyleOptionType { Type = SO_DockWidget }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; QString title; bool closable; @@ -403,7 +403,7 @@ class Q_WIDGETS_EXPORT QStyleOptionViewItem : public QStyleOption { public: enum StyleOptionType { Type = SO_ViewItem }; - enum StyleOptionVersion { Version = 4 }; + enum StyleOptionVersion { Version = 1 }; enum Position { Left, Right, Top, Bottom }; @@ -455,7 +455,7 @@ class Q_WIDGETS_EXPORT QStyleOptionToolBox : public QStyleOption { public: enum StyleOptionType { Type = SO_ToolBox }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; QString text; QIcon icon; @@ -591,7 +591,7 @@ class Q_WIDGETS_EXPORT QStyleOptionComboBox : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_ComboBox }; - enum StyleOptionVersion { Version = 2 }; + enum StyleOptionVersion { Version = 1 }; bool editable; QRect popupRect; |