diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:19:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:50:02 +0200 |
| commit | 33ad940cddf0a9529f205fe645f1b1d76f6f04f1 (patch) | |
| tree | 72751567959407b3c50dc92c56529e6159099ce7 /src/client/qwaylanddatadevice.cpp | |
| parent | 061ed4599dd2b384e4ef74b297640bf4e92f7f43 (diff) | |
| parent | 1bc3b0fdc8d934c1ab69a902054681896b56d672 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/client/qwaylanddisplay.cpp
src/client/qwaylanddisplay_p.h
src/client/qwaylandxdgpopup_p.h
Change-Id: If86ea09971773dc6c541f07819459a90e8ab73a0
Diffstat (limited to 'src/client/qwaylanddatadevice.cpp')
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index afc8849b3..0ff1f1979 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -56,8 +56,6 @@ #include <qpa/qplatformdrag.h> #include <qpa/qwindowsysteminterface.h> -#include <QDebug> - QT_BEGIN_NAMESPACE namespace QtWaylandClient { @@ -110,7 +108,10 @@ void QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon) { m_dragSource.reset(new QWaylandDataSource(m_display->dndSelectionHandler(), mimeData)); connect(m_dragSource.data(), &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::dragSourceCancelled); + QWaylandWindow *origin = m_display->currentInputDevice()->pointerFocus(); + if (!origin) + origin = m_display->currentInputDevice()->touchFocus(); start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial()); } @@ -129,8 +130,6 @@ void QWaylandDataDevice::data_device_drop() { QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); - qDebug() << Q_FUNC_INFO << drag << m_dragOffer.data(); - QMimeData *dragData = 0; Qt::DropActions supportedActions; if (drag) { |