From d2e83f3056f1379016c48ae3b44f45f5363449f5 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Wed, 20 Jun 2012 10:29:04 +0900 Subject: Make qtbase compile with QT_NO_DRAGANDDROP Change-Id: Ief16e435af6e6d246b84505a1c1208994c7b0b38 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jeremy Katz --- src/gui/kernel/qdnd_p.h | 6 +++++- src/plugins/platforms/xcb/qxcbmime.cpp | 4 ++-- src/plugins/platforms/xcb/qxcbmime.h | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index 764b73c06f..f793764560 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -69,7 +69,7 @@ class QEventLoop; class QMouseEvent; class QPlatformDrag; -#ifndef QT_NO_DRAGANDDROP +#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) class Q_GUI_EXPORT QInternalMimeData : public QMimeData { @@ -95,6 +95,10 @@ protected: virtual QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const = 0; }; +#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) + +#ifndef QT_NO_DRAGANDDROP + class QDragPrivate : public QObjectPrivate { public: diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp index 6676af0a05..580efd97cf 100644 --- a/src/plugins/platforms/xcb/qxcbmime.cpp +++ b/src/plugins/platforms/xcb/qxcbmime.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_DRAGANDDROP +#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) QXcbMime::QXcbMime() : QInternalMimeData() @@ -291,6 +291,6 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString return 0; } -#endif // QT_NO_DRAGANDDROP +#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbmime.h b/src/plugins/platforms/xcb/qxcbmime.h index c7bbc2c4fa..0bc155177c 100644 --- a/src/plugins/platforms/xcb/qxcbmime.h +++ b/src/plugins/platforms/xcb/qxcbmime.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_DRAGANDDROP +#if !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) class QXcbMime : public QInternalMimeData { Q_OBJECT @@ -69,7 +69,8 @@ public: const QList &atoms, QByteArray *requestedEncoding); }; -#endif // QT_NO_DRAGANDDROP +#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD)) + QT_END_NAMESPACE -- cgit v1.2.3