From 60783291ff967b1441518e749d2dcf4e7bc4b831 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 28 Aug 2012 15:33:35 +0200 Subject: auto tests: updated for new QStyle pure virtuals QStyle::standardIconImplementation() & layoutSpacingImplementation() are removed, and standardIcon() & layoutSpacing() made pure virtual. Change-Id: If8ab6cfef0b639b7973be22dd630ba3e6f39a225 Reviewed-by: Gabriel de Dietrich --- .../styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/auto/widgets/styles') diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 12cdbf5d3d..0fb3060dc8 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -1168,6 +1168,22 @@ class ProxyStyle : public QStyle return style->generatedIconPixmap(mode, pix, opt); } + int layoutSpacing(QSizePolicy::ControlType c1, + QSizePolicy::ControlType c2, + Qt::Orientation ori, + const QStyleOption *opt, + const QWidget *w) const + { + return style->layoutSpacing(c1, c2, ori, opt, w); + } + + QIcon standardIcon(StandardPixmap si, + const QStyleOption *opt, + const QWidget *w) const + { + return style->standardIcon(si, opt, w); + } + private: QStyle *style; }; -- cgit v1.2.3