From 27aa41cbba6c0bd76148fde63863cfbba0ec2456 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2012 00:52:26 +0100
Subject: Made QMacStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QMacStyle directly.

Change-Id: I44a2f5ee3fe08ecc837b593a2a2737eb90e8c267
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/widgets/widgets/qcombobox.cpp     | 2 +-
 src/widgets/widgets/qdockwidget.cpp   | 2 +-
 src/widgets/widgets/qmdiarea.cpp      | 2 +-
 src/widgets/widgets/qmdisubwindow.cpp | 2 +-
 src/widgets/widgets/qpushbutton.cpp   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index f22fc196a2..bf650c513b 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -67,7 +67,7 @@
 #include <qdebug.h>
 #if defined(Q_WS_MAC) && !defined(QT_NO_EFFECTS) && !defined(QT_NO_STYLE_MAC)
 #include <private/qcore_mac_p.h>
-#include <QMacStyle>
+#include <private/qmacstyle_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
 #endif
 #ifndef QT_NO_EFFECTS
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 12f957412f..d8d67ca6c8 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -63,7 +63,7 @@
 #ifdef Q_WS_MAC
 #include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
-#include <qmacstyle_mac.h>
+#include <private/qmacstyle_mac_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 3b4f026130..66dc49f5f7 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -163,7 +163,7 @@
 #include <QApplication>
 #include <QStyle>
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
-#include <QMacStyle>
+#include <private/qmacstyle_mac_p.h>
 #endif
 #include <QChildEvent>
 #include <QResizeEvent>
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index a99f2d3d1d..8d11778266 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -161,7 +161,7 @@
 #include <QScrollBar>
 #include <QDebug>
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
-#include <QMacStyle>
+#include <private/qmacstyle_mac_p.h>
 #endif
 #include <QMdiArea>
 
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 0aeec551d6..d3f63ad138 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -59,8 +59,8 @@
 #include "qlayoutitem.h"
 #include "qdialogbuttonbox.h"
 #ifdef Q_WS_MAC
-#include "qmacstyle_mac.h"
 #include "private/qmacstyle_mac_p.h"
+#include "private/qmacstyle_mac_p_p.h"
 #endif // Q_WS_MAC
 
 #ifndef QT_NO_ACCESSIBILITY
-- 
cgit v1.2.3