From 2eca30ab9d9bed3afc08d5b300c5820cae3b0083 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 12 Oct 2009 18:57:53 +0200 Subject: Fix default action in s60 drag'n'drop manager Default action was always MoveAction, which removed the data from the source widget, even if not accepted anywhere. Now uses the default action from the base class manager. Task-number: QT-736 Task-number: QTBUG-4356 Reviewed-by: Aleksandar Sasha Babic --- src/gui/kernel/qdnd_s60.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp index 3d6ecd2..a8d3ac5 100644 --- a/src/gui/kernel/qdnd_s60.cpp +++ b/src/gui/kernel/qdnd_s60.cpp @@ -277,7 +277,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) qApp->installEventFilter(this); - global_accepted_action = Qt::MoveAction; + global_accepted_action = defaultAction(dragPrivate()->possible_actions, Qt::NoModifier); qt_symbian_dnd_dragging = true; eventLoop = new QEventLoop; @@ -288,7 +288,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) #ifndef QT_NO_CURSOR qt_symbian_set_cursor_visible(false); - + overrideCursor = QCursor(); //deref the cursor data qt_symbian_dnd_dragging = false; #endif -- cgit v0.12