diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-03-16 17:02:21 +0100 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-03-20 07:51:36 +0000 |
| commit | 91a52fc6a0a8b0fc40285967e5da05ea72e1d75b (patch) | |
| tree | 33613cd26f91e018c0797f20d0d5fc820cea4e06 /src | |
| parent | 0ffb7c419a6d00fa8db00c811968d45ba5193856 (diff) | |
widgets: Add a QT_CONFIG(style_stylesheet) guard
for isWindowsStyle in QDockWidget
Change-Id: Id471b91a415f1a677ced6022bdd05b7e1b72aad2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index e17c2c1f4c..84cb78a474 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -160,9 +160,13 @@ bool QDockWidgetTitleButton::event(QEvent *event) static inline bool isWindowsStyle(const QStyle *style) { // Note: QStyleSheetStyle inherits QWindowsStyle - const QStyle *effectiveStyle = style->inherits("QStyleSheetStyle") - ? static_cast<const QStyleSheetStyle *>(style)->baseStyle() - : style; + const QStyle *effectiveStyle = style; + +#if QT_CONFIG(style_stylesheet) + if (style->inherits("QStyleSheetStyle")) + effectiveStyle = static_cast<const QStyleSheetStyle *>(style)->baseStyle(); +#endif + return effectiveStyle->inherits("QWindowsStyle"); } |