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/gui/kernel/qwindow.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/gui/kernel/qwindow.cpp') diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 2c7e061bcf..9abe04810b 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -55,7 +55,9 @@ # include "qaccessible.h" #endif #include "qhighdpiscaling_p.h" +#if QT_CONFIG(draganddrop) #include "qshapedpixmapdndwindow_p.h" +#endif // QT_CONFIG(draganddrop) #include @@ -382,7 +384,11 @@ void QWindowPrivate::setVisible(bool visible) QGuiApplicationPrivate::hideModalWindow(q); // QShapedPixmapWindow is used on some platforms for showing a drag pixmap, so don't block // input to this window as it is performing a drag - QTBUG-63846 - } else if (visible && QGuiApplication::modalWindow() && !qobject_cast(q)) { + } else if (visible && QGuiApplication::modalWindow() +#if QT_CONFIG(draganddrop) + && !qobject_cast(q) +#endif // QT_CONFIG(draganddrop) + ) { QGuiApplicationPrivate::updateBlockedStatus(q); } -- cgit v1.2.3