From d2e83f3056f1379016c48ae3b44f45f5363449f5 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Wed, 20 Jun 2012 10:29:04 +0900
Subject: Make qtbase compile with QT_NO_DRAGANDDROP

Change-Id: Ief16e435af6e6d246b84505a1c1208994c7b0b38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
---
 src/plugins/platforms/xcb/qxcbmime.h | 5 +++--
 1 file changed, 3 insertions(+), 2 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 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<xcb_atom_t> &atoms, QByteArray *requestedEncoding);
 };
 
-#endif // QT_NO_DRAGANDDROP
+#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
+
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3