diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-11 14:38:24 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-12 01:36:33 +0100 |
| commit | 9061ab9f7ea0f84997c3fd7659d92267ad36a4ba (patch) | |
| tree | 86df6f2994a50012ed152b63c5e44954f70b6153 /Source/WebKit/qt/WidgetSupport | |
| parent | 4dd4c3583208adfe9074a467e5f6fb750109c86b (diff) | |
| download | qtwebkit-9061ab9f7ea0f84997c3fd7659d92267ad36a4ba.tar.gz | |
Revert "Use non transient scrollbars on Mac"
The patch made all checks for m_style->inherits("QMacStyle")
in the StyleFacadeImp fail.
This reverts commit 08d610737197b47bdfc7f78b0f712c337cc87286.
Change-Id: Ie3f4d1cadcf32a71935e87075fbaf48c66c82f5f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'Source/WebKit/qt/WidgetSupport')
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp index 2c4babc75..7e2b8cab7 100644 --- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp +++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp @@ -28,9 +28,6 @@ #include <QApplication> #include <QLineEdit> #include <QPainter> -#ifdef Q_OS_MAC -#include <QProxyStyle> -#endif #include <QPushButton> #include <QStyleFactory> #include <QStyleOption> @@ -481,21 +478,6 @@ QObject* QStyleFacadeImp::widgetForPainter(QPainter* painter) return 0; } -#ifdef Q_OS_MAC -class QMacNonTransientScrollBarsProxyStyle : public QProxyStyle -{ -public: - QMacNonTransientScrollBarsProxyStyle(QStyle *bs) : QProxyStyle(bs) { } - - int styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *hret) const - { - if (sh == SH_ScrollBar_Transient) - return 0; - return baseStyle()->styleHint(sh, opt, w, hret); - } -}; -#endif // Q_OS_MAC - QStyle* QStyleFacadeImp::style() const { if (m_style) @@ -509,10 +491,6 @@ QStyle* QStyleFacadeImp::style() const if (!m_style) m_style = QApplication::style(); -#ifdef Q_OS_MAC - m_style = new QMacNonTransientScrollBarsProxyStyle(m_style); -#endif - return m_style; } |