diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-10-21 17:23:20 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-10-21 17:51:31 +0200 |
| commit | 35bf5c211b148af98bba00eaf662d6dbdefbf24a (patch) | |
| tree | 2c4dc005529613f98a0f3b443d8c41833d59b5a5 | |
| parent | 3c2115cd5956d3e60e1e053a319b528ff0238eae (diff) | |
| download | qtwebkit-35bf5c211b148af98bba00eaf662d6dbdefbf24a.tar.gz | |
[Windows] Also check for QApplication::style when animating buttons.
The fallback style for a custom style sheet is QApplication::style(),
which defaults to QWindowsVistaStyle on most (if not all) windows
systems.
Task-number: QTBUG-39400
Change-Id: Ib05571033730ed26a39f89d8e9fe948c4b280e64
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index 22eba69cd..db3994667 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -248,7 +248,7 @@ void QStyleFacadeImp::paintButton(QPainter* painter, QStyleFacade::ButtonType ty QWidget* widget = qobject_cast<QWidget*>(widgetForPainter(painter)); MappedStyleOption<QStyleOptionButton> option(widget, proxyOption); - if (m_style->inherits("QWindowsVistaStyle")) + if (m_style->inherits("QWindowsVistaStyle") || QApplication::style()->inherits("QWindowsVistaStyle")) option.styleObject = 0; if (type == PushButton) |