diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-12 16:57:53 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-12 17:31:53 (GMT) |
| commit | 2eca30ab9d9bed3afc08d5b300c5820cae3b0083 (patch) | |
| tree | 0f7226e077074f4c62342ae850e784ef6a9a2c44 | |
| parent | 38b95b106cfd3949e6830fd516fbc31333b6ac5f (diff) | |
| download | Qt-2eca30ab9d9bed3afc08d5b300c5820cae3b0083.zip Qt-2eca30ab9d9bed3afc08d5b300c5820cae3b0083.tar.gz Qt-2eca30ab9d9bed3afc08d5b300c5820cae3b0083.tar.bz2 | |
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
| -rw-r--r-- | src/gui/kernel/qdnd_s60.cpp | 4 |
1 files 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 |