diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
commit | c76a1716a3e51a9fac78377890ea0161a9658344 (patch) | |
tree | 6d65c1f5c55f7b139aa2a3222847963edd379534 /src/client/qwaylanddnd.cpp | |
parent | acd10cd393abe04a8fd6fe3ab14055e09c85bc15 (diff) | |
parent | f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba (diff) |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I1efd16d6c5f939d61001376c3b010eae1927595b
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 |