Make sure we can build with -no-feature-draganddrop

We move QInternalMimeData to a separate file, because this class is
used, even if draganddrop is disabled. From now on, include
qinternalmimedata_p.h instead of qdnd_p.h for QInternalMimeData.

Change-Id: I594e08e2e90d574dc445119091686b4b69e4731b
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 117de8edf9..c9f321c3f6 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -63,9 +63,11 @@
 #include <private/qabstractitemdelegate_p.h>
 
 #include <qpa/qplatformintegration.h>
+#if QT_CONFIG(draganddrop)
 #include <qpa/qplatformdrag.h>
-#include <private/qguiapplication_p.h>
 #include <private/qdnd_p.h>
+#endif
+#include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -515,7 +517,7 @@ bool QAbstractItemDelegatePrivate::editorEventFilter(QObject *object, QEvent *ev
                     return false;
                 w = w->parentWidget();
             }
-#ifndef QT_NO_DRAGANDDROP
+#if QT_CONFIG(draganddrop)
             // The window may lose focus during an drag operation.
             // i.e when dragging involves the taskbar on Windows.
             QPlatformDrag *platformDrag = QGuiApplicationPrivate::instance()->platformIntegration()->drag();