diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-23 15:54:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 14:16:44 +0100 |
commit | f61a335589009a12af0a4ba7866637ffaee2357e (patch) | |
tree | a3da4360e864dfa65239e32a78580e5157156c97 /tests | |
parent | 5ad4e14fb14ae9829b09df6afd6535ffb28a743c (diff) |
tst_QMenuBar: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: I422e7d67fadbb169d19285aab0a8ba0f3d668697
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 572f0a6a4f..2535e23ab8 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -45,7 +45,8 @@ #include <qmainwindow.h> #include <qmenubar.h> #include <qstyle.h> -#include <qwindowsstyle.h> +#include <qproxystyle.h> +#include <qstylefactory.h> #include <qdesktopwidget.h> #include <qaction.h> #include <qstyleoption.h> @@ -1158,8 +1159,10 @@ void tst_QMenuBar::task256322_highlight() void tst_QMenuBar::menubarSizeHint() { - struct MyStyle : public QWindowsStyle + struct MyStyle : public QProxyStyle { + MyStyle() : QProxyStyle(QStyleFactory::create("windows")) { } + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const { // I chose strange values (prime numbers to be more sure that the size of the menubar is correct) @@ -1174,7 +1177,7 @@ void tst_QMenuBar::menubarSizeHint() case PM_MenuBarPanelWidth: return 1; default: - return QWindowsStyle::pixelMetric(metric, option, widget); + return QProxyStyle::pixelMetric(metric, option, widget); } } } style; |