From d1bfad86e57eb52d3069d3076c7e1ccf23775a95 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Fri, 22 Aug 2014 11:17:34 +0200 Subject: [PATCH] Use QProxyStyle instead of QMacStyle. QMacStyle is not available anymore with At5 and QProxyStyle is present since Qt4.6 as an alternative --- src/frontends/qt4/GuiWorkArea.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 4e4d3d467e..2604f2a386 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -62,7 +62,7 @@ #include #include #ifdef Q_WS_MACX -#include +#include #endif #include #include @@ -1488,13 +1488,13 @@ void EmbeddedWorkArea::disable() //////////////////////////////////////////////////////////////////// #ifdef Q_WS_MACX -class NoTabFrameMacStyle : public QMacStyle { +class NoTabFrameMacStyle : public QProxyStyle { public: /// QRect subElementRect(SubElement element, const QStyleOption * option, const QWidget * widget = 0) const { - QRect rect = QMacStyle::subElementRect(element, option, widget); + QRect rect = QProxyStyle::subElementRect(element, option, widget); bool noBar = static_cast(widget)->count() <= 1; // The Qt Mac style puts the contents into a 3 pixel wide box -- 2.39.2