diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-06-17 15:30:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-01 14:08:09 +0200 |
| commit | e4becdc3d310a0dd1a6d34d0796a52b21dedeb2d (patch) | |
| tree | f5ba6a59a37efd060a1f5bc979fbf4ccc06b35ac /src | |
| parent | 7beca6e20f232adb8bb79aa55b3eba900dc8b8de (diff) | |
Move deletion of the QDrag object into QDragManager::drag().
The QDrag objects were apparently leaking on all platforms
other than XCB.
Task-number: QTBUG-39651
Change-Id: I09efcd250c1f42eb385e9d5779be7af6b9b59376
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qdnd.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index d34a135eb7..328ca389ed 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -142,6 +142,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) QGuiApplicationPrivate::instance()->notifyDragStarted(o); const Qt::DropAction result = m_platformDrag->drag(m_object); m_object = 0; + o->deleteLater(); return result; } diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index bcadcd1f02..bd28548cba 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -1010,9 +1010,6 @@ void QXcbDrag::handleFinished(const xcb_client_message_event_t *event) // current_target = 0; // current_proxy_target = 0; - if (t.drag) - t.drag->deleteLater(); - // current_target = target; // current_proxy_target = proxy_target; // current_embedding_widget = embedding_widget; |