From 9f27bfb31acfba49a74a342d9249f24633a7ade2 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann 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 --- src/plugins/platforms/xcb/qxcbconnection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/xcb/qxcbconnection.h') diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index d9321d94d0..583659ea81 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -424,7 +424,7 @@ public: #ifndef QT_NO_CLIPBOARD QXcbClipboard *clipboard() const { return m_clipboard; } #endif -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QXcbDrag *drag() const { return m_drag; } #endif @@ -673,7 +673,7 @@ private: #ifndef QT_NO_CLIPBOARD QXcbClipboard *m_clipboard = nullptr; #endif -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QXcbDrag *m_drag = nullptr; #endif QScopedPointer m_wmSupport; -- cgit v1.2.3