diff options
author | Andy Shaw <andy.shaw@qt.io> | 2018-06-25 09:41:27 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2018-06-25 13:53:15 +0000 |
commit | 23f9dd17b5f999b6a4c78f7513ea1c5a20d1208e (patch) | |
tree | a4c6f36cca3a27b1d2c2eafc5d12453c98cf8c93 | |
parent | 8b6e04bc584c903fe60ffb60da9592eb1c1a073b (diff) |
Build without the draganddrop feature
Change-Id: I5e3a3ebd36d49fdf649eec5a3fb0a8fdb048ce0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/quick/items/qquickdrag.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
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> |