AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move deletion of the QDrag object into QDragManager::drag().

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2014-06-17 15:30:34 +02:00
parent 7beca6e20f
commit e4becdc3d3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/kernel/qdnd.cpp
View File

@ -142,6 +142,7 @@ Qt::DropAction QDragManager::drag(QDrag *o)
QGuiApplicationPrivate::instance()->notifyDragStarted(o); QGuiApplicationPrivate::instance()->notifyDragStarted(o);
const Qt::DropAction result = m_platformDrag->drag(m_object); const Qt::DropAction result = m_platformDrag->drag(m_object);
m_object = 0; m_object = 0;
o->deleteLater();
return result; return result;
} }

3
src/plugins/platforms/xcb/qxcbdrag.cpp
View File

@ -1010,9 +1010,6 @@ void QXcbDrag::handleFinished(const xcb_client_message_event_t *event)
// current_target = 0; // current_target = 0;
// current_proxy_target = 0; // current_proxy_target = 0;
if (t.drag)
t.drag->deleteLater();
// current_target = target; // current_target = target;
// current_proxy_target = proxy_target; // current_proxy_target = proxy_target;
// current_embedding_widget = embedding_widget; // current_embedding_widget = embedding_widget;