diff options
author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-28 15:33:35 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 18:56:35 +0200 |
commit | 60783291ff967b1441518e749d2dcf4e7bc4b831 (patch) | |
tree | 1b187fadac7ce4e214039b9e9ecfd887a8dade16 /tests/auto/widgets/styles | |
parent | 50e3da79bf15374cc6e2b7a108004a1b7b1c4126 (diff) |
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 <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'tests/auto/widgets/styles')
-rw-r--r-- | tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
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; }; |