whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Motif style test handling from tst_QGraphicsView::scrollBarRanges 

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ø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2553d9709f305c55a133306e40c1930d46737026)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Volker Hilsheimer 2024-10-23 16:49:21 +02:00 committed by Qt Cherry-pick Bot
parent 1fac111731
commit 7c54868d8c
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -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 ;-)