summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2012-06-20 10:29:04 +0900
committerQt by Nokia <qt-info@nokia.com>2012-06-24 21:22:51 +0200
commitd2e83f3056f1379016c48ae3b44f45f5363449f5 (patch)
tree32ea0f906cba3e7b738ed6254f9476348bc772b3 /src/plugins/platforms/xcb
parent7590ca03ced07f1a3e9d1aab30e6d5b239009ac4 (diff)
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>
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.cpp4
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.h5
2 files changed, 5 insertions, 4 deletions
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<xcb_atom_t> &atoms, QByteArray *requestedEncoding);
};
-#endif // QT_NO_DRAGANDDROP
+#endif // !(defined(QT_NO_DRAGANDDROP) && defined(QT_NO_CLIPBOARD))
+
QT_END_NAMESPACE