diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:48:57 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:50:29 +0100 |
commit | 7321747048a99626acbe054d34c3d364bfa73bcc (patch) | |
tree | 6f1905886dfed35dbba512b011bd39e18b1497ff /src/client/qwaylanddnd.cpp | |
parent | 59965ed2277bb62e0ec38b149b570285828660fd (diff) | |
parent | c76a1716a3e51a9fac78377890ea0161a9658344 (diff) |
Merge remote-tracking branch 'qt/5.7' into 5.8
Change-Id: Ibfe6fe6ed983b537d55544883b7dc75e5cc3fc37
Diffstat (limited to 'src/client/qwaylanddnd.cpp')
-rw-r--r-- | src/client/qwaylanddnd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylanddnd.cpp b/src/client/qwaylanddnd.cpp index b59ac6d70..e29267fc9 100644 --- a/src/client/qwaylanddnd.cpp +++ b/src/client/qwaylanddnd.cpp @@ -50,7 +50,7 @@ #include <QDebug> QT_BEGIN_NAMESPACE - +#ifndef QT_NO_DRAGANDDROP namespace QtWaylandClient { QWaylandDrag::QWaylandDrag(QWaylandDisplay *display) @@ -98,7 +98,7 @@ void QWaylandDrag::drop(const QPoint &globalPos) void QWaylandDrag::endDrag() { - // Do nothing + m_display->currentInputDevice()->handleEndDrag(); } void QWaylandDrag::updateTarget(const QString &mimeType) @@ -131,5 +131,5 @@ void QWaylandDrag::finishDrag(const QPlatformDropQtResponse &response) } } - +#endif // QT_NO_DRAGANDDROP QT_END_NAMESPACE |