From 23f9dd17b5f999b6a4c78f7513ea1c5a20d1208e Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Mon, 25 Jun 2018 09:41:27 +0200
Subject: Build without the draganddrop feature

Change-Id: I5e3a3ebd36d49fdf649eec5a3fb0a8fdb048ce0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quick/items/qquickdrag.cpp        | 4 ++--
 src/quick/items/qquicktextcontrol.cpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 91f45894a0..f60f3c1ccf 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -41,7 +41,6 @@
 
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
-#include <qpa/qplatformdrag.h>
 #include <private/qquickitem_p.h>
 #include <QtQuick/private/qquickevents_p_p.h>
 #include <private/qquickitemchangelistener_p.h>
@@ -50,12 +49,13 @@
 #include <private/qv4scopedvalue_p.h>
 #include <QtCore/qmimedata.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtGui/qdrag.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
 
 #if QT_CONFIG(draganddrop)
+#include <qpa/qplatformdrag.h>
+#include <QtGui/qdrag.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 1cb12235c1..38ca7283b4 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -47,7 +47,6 @@
 #include <qfontmetrics.h>
 #include <qevent.h>
 #include <qdebug.h>
-#include <qdrag.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 #include <qinputmethod.h>
-- 
cgit v1.2.3