Remove QPlatformIntegration/QPlatformTheme from QGuiAppPrivate.

Forward-declare instead.

Change-Id: I3851994e8bc05b389e94e948478339ba33d521c1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 363c193..0d00df2 100644 (file)
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -49,6 +49,7 @@
 #include <QtGui/QGuiApplication>
 #include <private/qguiapplication_p.h>
 #include "qplatformaccessibility_qpa.h"
+#include "qplatformintegration_qpa.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>

diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 8184200..f3c26dd 100644 (file)
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -41,6 +41,7 @@
 
 #include "qbitmap.h"
 #include "qplatformpixmap_qpa.h"
+#include "qplatformintegration_qpa.h"
 #include "qimage.h"
 #include "qscreen.h"
 #include "qvariant.h"

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 45a8e29..96d7a04 100644 (file)
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -41,6 +41,7 @@
 
 #include <qdebug.h>
 #include "qnativeimage_p.h"
+#include "qplatformscreen_qpa.h"
 #include "private/qguiapplication_p.h"
 #include "qscreen.h"
 

diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 5162ea8..30ac6ce 100644 (file)
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qplatformpixmap_qpa.h"
+#include "qplatformintegration_qpa.h"
 #include <QtCore/qbuffer.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qimagereader.h>

diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp
index ec94038..b33ccd4 100644 (file)
--- a/src/gui/kernel/qclipboard_qpa.cpp
+++ b/src/gui/kernel/qclipboard_qpa.cpp
@@ -46,6 +46,7 @@
 #include "qmimedata.h"
 #include "private/qguiapplication_p.h"
 #include "qplatformclipboard_qpa.h"
+#include "qplatformintegration_qpa.h"
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index b9f0fe4..2fb250c 100644 (file)
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -59,6 +59,7 @@
 #include "qimagewriter.h"
 #include "qdebug.h"
 #include <ctype.h>
+#include <qplatformintegration_qpa.h>
 #include <qplatformdrag_qpa.h>
 
 #include <private/qguiapplication_p.h>

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 625b466..7cb3d4b 100644 (file)
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -49,6 +49,7 @@
 #include "qplatformwindow_qpa.h"
 #include "qplatformnativeinterface_qpa.h"
 #include "qplatformtheme_qpa.h"
+#include "qplatformintegration_qpa.h"
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/private/qcoreapplication_p.h>

diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index d853bc1..c374a05 100644 (file)
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QGuiApplicationPrivate;
 class QPlatformNativeInterface;
+class QPlatformIntegration;
 class QPalette;
 class QScreen;
 class QStyleHints;

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index f86d826..7e6e0aa 100644 (file)
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -51,14 +51,14 @@
 
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
-#include <QtGui/qplatformintegration_qpa.h>
-#include <QtGui/qplatformtheme_qpa.h>
 #include "private/qshortcutmap_p.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+class QPlatformIntegration;
+class QPlatformTheme;
 
 class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate
 {

diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h
index 862764d..8a17c85 100644 (file)
--- a/src/gui/kernel/qinputmethod_p.h
+++ b/src/gui/kernel/qinputmethod_p.h
@@ -47,6 +47,7 @@
 #include <QtCore/QWeakPointer>
 #include <QTransform>
 #include <qplatforminputcontext_qpa.h>
+#include <qplatformintegration_qpa.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_HEADER

diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index debfbe2..ba51653 100644 (file)
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qplatformopenglcontext_qpa.h"
+#include "qplatformintegration_qpa.h"
 #include "qopenglcontext.h"
 #include "qopenglcontext_p.h"
 #include "qwindow.h"

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 85f12dd..9c6b6c4 100644 (file)
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -42,6 +42,7 @@
 #include "qwindow.h"
 
 #include "qplatformwindow_qpa.h"
+#include "qplatformintegration_qpa.h"
 #include "qsurfaceformat.h"
 #ifndef QT_NO_OPENGL
 #include "qplatformopenglcontext_qpa.h"

diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 37446f4..03c2fc8 100644 (file)
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -43,6 +43,7 @@
 #include <qwindow.h>
 #include <qpixmap.h>
 #include <qplatformbackingstore_qpa.h>
+#include <qplatformintegration_qpa.h>
 #include <qscreen.h>
 
 #include <private/qguiapplication_p.h>

diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp
index 7fcbe98..29ba776 100644 (file)
--- a/src/gui/text/qfont_qpa.cpp
+++ b/src/gui/text/qfont_qpa.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/QPlatformIntegration>
 #include <QtGui/QPlatformFontDatabase>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 77262d6..7fa486e 100644 (file)
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -50,6 +50,7 @@
 #include "qfileinfo.h"
 #include "private/qunicodetables_p.h"
 #include "qfontengine_p.h"
+#include "qplatformintegration_qpa.h"
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qplatformfontdatabase_qpa.h>

diff --git a/src/gui/text/qrawfont_qpa.cpp b/src/gui/text/qrawfont_qpa.cpp
index e9515fd..d037d59 100644 (file)
--- a/src/gui/text/qrawfont_qpa.cpp
+++ b/src/gui/text/qrawfont_qpa.cpp
@@ -44,6 +44,7 @@
 #if !defined(QT_NO_RAWFONT)
 
 #include "qrawfont_p.h"
+#include "qplatformintegration_qpa.h"
 #include <QtGui/qplatformfontdatabase_qpa.h>
 #include <private/qguiapplication_p.h>
 

diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 13e2585..25fb08f 100644 (file)
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -53,6 +53,7 @@
 #include <qurl.h>
 #include <qmutex.h>
 #include <qplatformservices_qpa.h>
+#include <qplatformintegration_qpa.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index f9b62c7..29c505e 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -45,6 +45,7 @@
 
 #include <QtCore>
 #include <QtGui>
+#include <qplatformscreen_qpa.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
index 319b55e..5336dbf 100644 (file)
--- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
@@ -43,6 +43,7 @@
 #include "qminimalbackingstore.h"
 #include "qscreen.h"
 #include <QtCore/qdebug.h>
+#include <QtGui/QPlatformScreen>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index 1b874e3..b682b87 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -50,6 +50,7 @@
 #include <stdio.h>
 
 #include <qplatforminputcontext_qpa.h>
+#include <qplatformintegration_qpa.h>
 
 #ifndef XK_ISO_Left_Tab
 #define XK_ISO_Left_Tab         0xFE20

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 4f05c4c..be3d527 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -50,6 +50,8 @@
 #include "qxcbkeyboard.h"
 #include "qxcbwmsupport.h"
 
+#include <qplatformintegration_qpa.h>
+
 #ifdef XCB_USE_DRI2
 #include "qdri2context.h"
 #endif

diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 41683a2..49b4dd3 100644 (file)
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -52,6 +52,7 @@
 #include "qwhatsthis.h"
 #include "qmenu.h"
 #include "qcursor.h"
+#include "qplatformtheme_qpa.h"
 #include "private/qdialog_p.h"
 #include "private/qguiapplication_p.h"
 #ifndef QT_NO_ACCESSIBILITY

diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 3d8bb5e..4a6f351 100644 (file)
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -54,6 +54,7 @@
 #include "qcursor.h"
 #include "qbitmap.h"
 #include "qtextdocument.h"
+#include "qplatformtheme_qpa.h"
 #include "private/qtextdocumentlayout_p.h"
 #include "qtoolbutton.h"
 #include "qdebug.h"

diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index a4f9dc9..e8415e3 100644 (file)
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -49,6 +49,7 @@
 #include "qtimer.h"
 #include "qlayout.h"
 #include "qpainter.h"
+#include "qplatformtheme_qpa.h"
 #include "qapplication.h"
 #include "qdesktopwidget.h"
 #ifndef QT_NO_ACCESSIBILITY

diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 7a8d39f..d797a4e 100644 (file)
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -55,6 +55,7 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
+#include <qplatformtheme_qpa.h>
 #include "private/qguiapplication_p.h"
 
 #ifndef QT_NO_MENUBAR

diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index c1643ea..563baef 100644 (file)
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -52,6 +52,7 @@
 #include <qsplashscreen.h>
 
 #include <qplatformpixmap_qpa.h>
+#include <qplatformintegration_qpa.h>
 #include <private/qguiapplication_p.h>
 #include <private/qdrawhelper_p.h>