0001-replace-QMacStyle-with-QProxyStyle-for-Qt5.patch (2,646 bytes)
From 2b919b223d98f5c6d1066b171f07ebc2ec643e92 Mon Sep 17 00:00:00 2001
From: Christian Hitz <christian@klarinett.li>
Date: Tue, 26 Mar 2013 19:31:07 +0100
Subject: [PATCH] replace QMacStyle with QProxyStyle for Qt5
---
Scribus/scribus/ui/colorcombo.h | 16 ++++++++++++++--
Scribus/scribus/ui/sccombobox.cpp | 14 +++++++++++++-
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Scribus/scribus/ui/colorcombo.h b/Scribus/scribus/ui/colorcombo.h
index 05f98f7..6285ca9 100644
--- a/Scribus/scribus/ui/colorcombo.h
+++ b/Scribus/scribus/ui/colorcombo.h
@@ -19,8 +19,12 @@ for which a new license (GPL+exception) is in place.
#include <QComboBox>
#ifdef Q_OS_MAC
+#ifdef USE_QT5
+#include <QProxyStyle>
+#else
#include <QMacStyle>
#endif
+#endif
#include "scribusapi.h"
#include "colorlistbox.h"
@@ -37,14 +41,22 @@ private:
#ifdef Q_OS_MAC
/// use listbox instead of popupmenu for combo boxes
- class ScMacStyle : public QMacStyle
+#ifdef USE_QT5
+ class ScMacStyle : public QProxyStyle
+#else
+ class ScMacStyle : public QMacStyle
+#endif
{
virtual int styleHint(StyleHint sh,
const QStyleOption * so,
const QWidget * w,
QStyleHintReturn * r) const
{
- return sh != QStyle::SH_ComboBox_Popup && QMacStyle::styleHint(sh, so, w, r);
+#ifdef USE_QT5
+ return sh != QStyle::SH_ComboBox_Popup && QProxyStyle::styleHint(sh, so, w, r);
+#else
+ return sh != QStyle::SH_ComboBox_Popup && QMacStyle::styleHint(sh, so, w, r);
+#endif
}
};
#endif
diff --git a/Scribus/scribus/ui/sccombobox.cpp b/Scribus/scribus/ui/sccombobox.cpp
index bca61ab..ee27ec7 100644
--- a/Scribus/scribus/ui/sccombobox.cpp
+++ b/Scribus/scribus/ui/sccombobox.cpp
@@ -17,16 +17,28 @@ for which a new license (GPL+exception) is in place.
#ifdef Q_OS_MAC
+#ifdef USE_QT5
+#include <QProxyStyle>
+#else
#include <QMacStyle>
+#endif
/// use listbox instead of popupmenu for combo boxes
+#ifdef USE_QT5
+class ScMacStyle : public QProxyStyle {
+#else
class ScMacStyle : public QMacStyle {
+#endif
virtual int styleHint(StyleHint sh,
const QStyleOption * so,
const QWidget * w,
QStyleHintReturn * r) const
{
- return sh != QStyle::SH_ComboBox_Popup && QMacStyle::styleHint(sh, so, w, r);
+#ifdef USE_QT5
+ return sh != QStyle::SH_ComboBox_Popup && QProxyStyle::styleHint(sh, so, w, r);
+#else
+ return sh != QStyle::SH_ComboBox_Popup && QMacStyle::styleHint(sh, so, w, r);
+#endif
}
};
#endif
--
1.8.1.2