From 7c54868d8cd4281dddd053d569af0927b6605ca5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 23 Oct 2024 16:49:21 +0200 Subject: [PATCH] Remove Motif style test handling from tst_QGraphicsView::scrollBarRanges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That style hasn't been in Qt for a few releases, no need for any special treatment. Change-Id: Ib0d4c7c10515b92267956748db11be00ce85d76f Reviewed-by: Tor Arne Vestbø (cherry picked from commit 2553d9709f305c55a133306e40c1930d46737026) Reviewed-by: Qt Cherry-pick Bot --- .../qgraphicsview/tst_qgraphicsview.cpp | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index d6929f4957..865f2eb4b0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -2864,24 +2864,6 @@ void tst_QGraphicsView::levelOfDetail() QTRY_COMPARE(item->lastLod, lod); } -// Simulates motif scrollbar for range tests -class FauxMotifStyle : public QCommonStyle { -public: - int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const override - { - if (hint == QStyle::SH_ScrollView_FrameOnlyAroundContents) - return true; - return QCommonStyle::styleHint(hint, option, widget, returnData); - } - - int pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const override - { - if (m == QStyle::PM_ScrollView_ScrollBarSpacing) - return 4; - return QCommonStyle::pixelMetric(m, opt, widget); - } -}; - static void scrollBarRanges_addTestData(const QString &style, bool styled) { const int viewWidth = 250; @@ -4115,10 +4097,7 @@ void tst_QGraphicsView::scrollBarRanges() view.setTransform(transform); view.setFrameStyle(useStyledPanel ? QFrame::StyledPanel : QFrame::NoFrame); - if (style == "motif") - stylePtr.reset(new FauxMotifStyle); - else - stylePtr.reset(QStyleFactory::create(style)); + stylePtr.reset(QStyleFactory::create(style)); view.setStyle(stylePtr.data()); view.setStyleSheet(" "); // enables style propagation ;-)