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

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>
bb10
J-P Nurmi 2012-11-23 15:54:19 +01:00 committed by The Qt Project
parent 5ad4e14fb1
commit f61a335589
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
View File

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