From 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 17 Sep 2014 18:27:54 +0200 Subject: Deprecate the QStyleOptionProgressBar::orientation member Its contents are already inside the "state" member. Fixes a "TODO" for Qt 5 (bumping it to Qt 6, where we will be able to break API). [ChangeLog][QtWidgets][Styles] The usage of the QStyleOptionProgressBar::orientation member has been deprecated. Task-number: QTBUG-25121 Change-Id: Ie531bb2f2733b15a213e83c9706468e2bf829359 Reviewed-by: Mitch Curtis Reviewed-by: Marc Mutz --- src/widgets/styles/qstyleoption.cpp | 3 +++ src/widgets/styles/qstyleoption.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/widgets/styles') diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index f642a05d13..c1cb732cc2 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1634,6 +1634,9 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version) \brief the progress bar's orientation (horizontal or vertical); the default orentation is Qt::Horizontal + \deprecated + Use the QStyle::State_Horizontal flag instead (in the the QStyleOption::state member). + \sa QProgressBar::orientation */ diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 94ec55002a..85d33f5444 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -325,7 +325,7 @@ public: QString text; Qt::Alignment textAlignment; bool textVisible; - Qt::Orientation orientation; + Qt::Orientation orientation; // ### Qt 6: remove bool invertedAppearance; bool bottomToTop; -- cgit v1.2.3