From 3db8f5fbb381f009b111cd91af30bfa9bf159a5d Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 8 May 2012 12:49:56 +0200
Subject: [PATCH] Remove qplatformdrag.h dependency in qguiapplication_p.h

Including a qpa/ header here doesn't really work very well
for other modules using qguiapplication_p.h.

Change-Id: I7620b40bc4731d5a74fe11537637f376c578a786
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 src/gui/kernel/qguiapplication.cpp            | 1 +
 src/gui/kernel/qguiapplication_p.h            | 3 +--
 src/widgets/itemviews/qitemdelegate.cpp       | 1 +
 src/widgets/itemviews/qstyleditemdelegate.cpp | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 62303eeea2..2efc29bddf 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -50,6 +50,7 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformdrag.h>
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/QVariant>
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 860c41d648..b7b8afc7ad 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -53,14 +53,13 @@
 #include "private/qwindowsysteminterface_qpa_p.h"
 #include "private/qshortcutmap_p.h"
 
-#include <qpa/qplatformdrag.h>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 class QPlatformIntegration;
 class QPlatformTheme;
+class QPlatformDragQtResponse;
 struct QDrawHelperGammaTables;
 
 class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index a9bb7271b3..252192a3fc 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -45,6 +45,7 @@
 #include <qabstractitemmodel.h>
 #include <qapplication.h>
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformdrag.h>
 #include <private/qguiapplication_p.h>
 #include <qbrush.h>
 #include <qlineedit.h>
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 5732f65f32..02ae80ca0b 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -45,6 +45,7 @@
 #include <qabstractitemmodel.h>
 #include <qapplication.h>
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformdrag.h>
 #include <private/qguiapplication_p.h>
 #include <qbrush.h>
 #include <qlineedit.h>