diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-28 01:00:17 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-29 11:13:03 +0100 |
| commit | f3fd887de1c9cf4717bf475e5bb1ddf79ac6521e (patch) | |
| tree | a3520d7a869cfb6188787a06292ea656dcde2b51 /src/gui/kernel/qdnd.cpp | |
| parent | 82ee87b7b83746bcc3d13af72979d0dca4c2de3d (diff) | |
| parent | 08f90adffdde1d7a4efa0de66f69091bd52d1d4b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/gui/kernel/qdnd.cpp')
| -rw-r--r-- | src/gui/kernel/qdnd.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index 5c5f166554..dd541af3b8 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -113,11 +113,12 @@ Qt::DropAction QDragManager::drag(QDrag *o) m_object->d_func()->target = 0; - QGuiApplicationPrivate::instance()->notifyDragStarted(o); + QGuiApplicationPrivate::instance()->notifyDragStarted(m_object.data()); const Qt::DropAction result = m_platformDrag->drag(m_object); - m_object = 0; - if (!m_platformDrag->ownsDragObject()) - o->deleteLater(); + if (!m_object.isNull() && !m_platformDrag->ownsDragObject()) + m_object->deleteLater(); + + m_object.clear(); return result; } |