From 9f27bfb31acfba49a74a342d9249f24633a7ade2 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 13 Apr 2018 09:01:43 +0200
Subject: 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>
---
 src/plugins/platforms/xcb/qxcbmime.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/plugins/platforms/xcb/qxcbmime.h')

diff --git a/src/plugins/platforms/xcb/qxcbmime.h b/src/plugins/platforms/xcb/qxcbmime.h
index 561631a377..f2136ec9f4 100644
--- a/src/plugins/platforms/xcb/qxcbmime.h
+++ b/src/plugins/platforms/xcb/qxcbmime.h
@@ -40,7 +40,7 @@
 #ifndef QXCBMIME_H
 #define QXCBMIME_H
 
-#include <private/qdnd_p.h>
+#include <QtGui/private/qinternalmimedata_p.h>
 
 #include <QtGui/QClipboard>
 
@@ -49,8 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
-
 class QXcbMime : public QInternalMimeData {
     Q_OBJECT
 public:
@@ -67,9 +65,6 @@ public:
                                         const QVector<xcb_atom_t> &atoms, QByteArray *requestedEncoding);
 };
 
-#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
-
-
 QT_END_NAMESPACE
 
 #endif // QXCBMIME_H
-- 
cgit v1.2.3