diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:15:15 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:15:15 +0200 |
| commit | 02c8fa204f53af27907ef48bc74c500d7a05c3a0 (patch) | |
| tree | 56519f143a72884a47c757d96c411e26c10c8a10 /src/gui/kernel/qguiapplication.cpp | |
| parent | 36e8cf3cdb50c0447695f35c2e63eed139704c13 (diff) | |
| parent | 0a63d5fed6e020e81d3c570d299d1292c33fa284 (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: Ie6757dd81b49f4d9e677dbd08f5378d6190187b7
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 30b942b30c..393a49587c 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -50,7 +50,6 @@ #include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformtheme.h> #include <qpa/qplatformintegration.h> -#include <qpa/qplatformdrag.h> #include <QtCore/QAbstractEventDispatcher> #include <QtCore/QStandardPaths> @@ -87,9 +86,13 @@ #include "private/qinputdevicemanager_p.h" #include "private/qtouchdevice_p.h" -#include "private/qdnd_p.h" #include <qpa/qplatformthemefactory_p.h> +#if QT_CONFIG(draganddrop) +#include <qpa/qplatformdrag.h> +#include <private/qdnd_p.h> +#endif + #ifndef QT_NO_CURSOR #include <qpa/qplatformcursor.h> #endif @@ -3047,7 +3050,7 @@ void QGuiApplicationPrivate::processExposeEvent(QWindowSystemInterfacePrivate::E QCoreApplication::sendSpontaneousEvent(window, &exposeEvent); } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformDragQtResponse QGuiApplicationPrivate::processDrag(QWindow *w, const QMimeData *dropData, const QPoint &p, Qt::DropActions supportedActions) { @@ -3107,7 +3110,7 @@ QPlatformDropQtResponse QGuiApplicationPrivate::processDrop(QWindow *w, const QM return response; } -#endif // QT_NO_DRAGANDDROP +#endif // QT_CONFIG(draganddrop) #ifndef QT_NO_CLIPBOARD /*! @@ -3923,7 +3926,7 @@ void QGuiApplicationPrivate::notifyThemeChanged() } } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag) { Q_UNUSED(drag) |