1 files changed, 6 insertions, 35 deletions
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index e7d83cbbaf..cc00bc1442 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -62,41 +62,16 @@
 #include "QtCore/qpoint.h"
 #include "private/qobject_p.h"
 #include "QtGui/qbackingstore.h"
-QT_BEGIN_NAMESPACE
-
-class QEventLoop;
-class QMouseEvent;
-class QPlatformDrag;
-
-#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
-
-class Q_GUI_EXPORT QInternalMimeData : public QMimeData
-{
-    Q_OBJECT
-public:
-    QInternalMimeData();
-    ~QInternalMimeData();
-
-    bool hasFormat(const QString &mimeType) const override;
-    QStringList formats() const override;
-    static bool canReadData(const QString &mimeType);
 
+// ### Remove the following include, once everybody includes
+//     qinternalmimedata_p.h for QInternalMimeData.
+#include "qinternalmimedata_p.h"
 
-    static QStringList formatsHelper(const QMimeData *data);
-    static bool hasFormatHelper(const QString &mimeType, const QMimeData *data);
-    static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data);
+QT_REQUIRE_CONFIG(draganddrop);
 
-protected:
-    QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
-
-    virtual bool hasFormat_sys(const QString &mimeType) const = 0;
-    virtual QStringList formats_sys() const = 0;
-    virtual QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const = 0;
-};
-
-#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
+QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_DRAGANDDROP
+class QPlatformDrag;
 
 class QDragPrivate : public QObjectPrivate
 {
@@ -142,10 +117,6 @@ private:
     Q_DISABLE_COPY(QDragManager)
 };
 
-
-#endif // !QT_NO_DRAGANDDROP
-
-
 QT_END_NAMESPACE
 
 #endif // QDND_P_H