From c0bc4c7638d8b7d46f8cb3175ddde2a59ca63983 Mon Sep 17 00:00:00 2001 From: Zhang Hao Date: Thu, 28 Oct 2021 17:37:32 +0800 Subject: [PATCH] Initialize QStyleOptionProgressBar with QStyle::State_Horizontal In Qt 5, QStyleOptionProgressBar::orientation was Qt::Horizontal by default. In Qt 6, we need to init state with QStyle::State_Horizontal so that code setting up a style option doesn't need to do so explicitly. Amends add8262f72befc4c6a25403a21269030111054d1 Pick-to: 6.2 Fixes: QTBUG-93412 Done-with: Volker Hilsheimer Change-Id: Iaa311cf0f4bab72c0bacbd8e698ba24660bca6b8 Reviewed-by: Volker Hilsheimer --- src/widgets/styles/qstyleoption.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 67dfdcb0153..06b07d2c4c8 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1535,6 +1535,7 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version) minimum(0), maximum(0), progress(0), textAlignment(Qt::AlignLeft), textVisible(false), invertedAppearance(false), bottomToTop(false) { + state |= QStyle::State_Horizontal; } /*!