From 5ad4e14fb14ae9829b09df6afd6535ffb28a743c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Fri, 23 Nov 2012 15:50:48 +0100
Subject: [PATCH] tst_QComboBox: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: Ic76ecc20ff600a7d401b44c8dc4d93198c06becc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
 tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 4f390fa2c8..8ac3fea457 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -72,9 +72,7 @@
 #include <qstylefactory.h>
 #include <qabstractitemview.h>
 #include <qstyleditemdelegate.h>
-#ifndef QT_NO_STYLE_WINDOWS
-#include <qwindowsstyle.h>
-#endif
+#include <qproxystyle.h>
 
 class tst_QComboBox : public QObject
 {
@@ -2428,9 +2426,11 @@ void tst_QComboBox::subControlRectsWithOffset()
 #ifndef QT_NO_STYLE_WINDOWS
 void tst_QComboBox::task260974_menuItemRectangleForComboBoxPopup()
 {
-    class TestStyle: public QWindowsStyle
+    class TestStyle: public QProxyStyle
     {
     public:
+        TestStyle() : QProxyStyle(QStyleFactory::create("windows")) { }
+
         int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *ret) const
         {
             if (hint == SH_ComboBox_Popup) return 1;