1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QGridLayout: use QProxyStyle instead of QWindowsStyle

Browse Source 
QWindowsStyle is soon to become an internal class.

Change-Id: If163aae6910c0b082a9bcca1ebbab66660cc005f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
J-P Nurmi 2012-11-23 16:00:46 +01:00 committed by The Qt Project
parent 7caaab5262
commit 8e7135c894
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
View File

@ -44,14 +44,13 @@
#include <qlayout.h> #include <qlayout.h>
#include <qapplication.h> #include <qapplication.h>
#include <qwidget.h> #include <qwidget.h>
#include <qwindowsstyle.h> #include <qproxystyle.h>
#include <qsizepolicy.h> #include <qsizepolicy.h>
//#include <QtGui> //#include <QtGui>
#include <QtWidgets/QLabel> #include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QtWidgets/QRadioButton> #include <QtWidgets/QRadioButton>
#include <QtWidgets/QWindowsStyle>
#include <QStyleFactory> #include <QStyleFactory>
class tst_QGridLayout : public QObject class tst_QGridLayout : public QObject
@ -458,11 +457,11 @@ void tst_QGridLayout::spacingAndSpacers()
} }
class Qt42Style : public QWindowsStyle class Qt42Style : public QProxyStyle
{ {
Q_OBJECT Q_OBJECT
public: public:
Qt42Style() : QWindowsStyle() Qt42Style() : QProxyStyle(QStyleFactory::create("windows"))
{ {
spacing = 6; spacing = 6;
margin = 9; margin = 9;
@ -494,7 +493,7 @@ int Qt42Style::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0
default: default:
break; break;
} }
return QWindowsStyle::pixelMetric(metric, option, widget); return QProxyStyle::pixelMetric(metric, option, widget);
} }
@ -915,11 +914,11 @@ void tst_QGridLayout::minMaxSize()
} }
class CustomLayoutStyle : public QWindowsStyle class CustomLayoutStyle : public QProxyStyle
{ {
Q_OBJECT Q_OBJECT
public: public:
CustomLayoutStyle() : QWindowsStyle() CustomLayoutStyle() : QProxyStyle(QStyleFactory::create("windows"))
{ {
hspacing = 5; hspacing = 5;
vspacing = 10; vspacing = 10;
@ -961,7 +960,7 @@ QRect CustomLayoutStyle::subElementRect(SubElement sr, const QStyleOption *opt,
} }
} }
if (rect.isNull()) if (rect.isNull())
rect = QWindowsStyle::subElementRect(sr, opt, widget); rect = QProxyStyle::subElementRect(sr, opt, widget);
return rect; return rect;
} }
@ -1016,7 +1015,7 @@ int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * opti
default: default:
break; break;
} }
return QWindowsStyle::pixelMetric(metric, option, widget); return QProxyStyle::pixelMetric(metric, option, widget);
} }
void tst_QGridLayout::styleDependentSpacingsAndMargins_data() void tst_QGridLayout::styleDependentSpacingsAndMargins_data()