From 364d3da3d5cce9a19b06b4fca04a91a0238248e3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 Sep 2018 09:34:54 +0200
Subject: QDockWidget: Fix icons being too large when using a style proxying
 Windows style

Extend the check for Windows style to QProxyStyle. Amends
43b9c9b9937c5aaeec611bd32a50a15e81573550.

Task-number: QTBUG-38776
Change-Id: I5331d0c29bea59c59309feeab153437a72e0e30f
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 src/widgets/widgets/qdockwidget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/widgets/widgets/qdockwidget.cpp')

diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 84cb78a474..0b2eee7180 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -45,6 +45,7 @@
 #include <qdrawutil.h>
 #include <qevent.h>
 #include <qfontmetrics.h>
+#include <qproxystyle.h>
 #include <qwindow.h>
 #include <qscreen.h>
 #include <qmainwindow.h>
@@ -166,6 +167,10 @@ static inline bool isWindowsStyle(const QStyle *style)
     if (style->inherits("QStyleSheetStyle"))
       effectiveStyle = static_cast<const QStyleSheetStyle *>(style)->baseStyle();
 #endif
+#if !defined(QT_NO_STYLE_PROXY)
+    if (style->inherits("QProxyStyle"))
+      effectiveStyle = static_cast<const QProxyStyle *>(style)->baseStyle();
+#endif
 
     return effectiveStyle->inherits("QWindowsStyle");
 }
-- 
cgit v1.2.3