diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-26 12:12:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 20:13:03 +0200 |
| commit | 4d0424b671a2cac8b1e8035f604ead9dbeae547b (patch) | |
| tree | 955233b88d5a9a8232d611da1e84591dc4567dfa /src/gui/kernel/qevent.cpp | |
| parent | a4ca3280c0042e427225fec4d059012a6a57ed65 (diff) | |
Ask the platform drag for the correct default drag action
This fixes a remaining feature regression from Qt 4.x, where the
dragmanager also determined the default action for a drag given
the set of supported actions and the keyboard modifiers.
Task-number: QTBUG-25373
Change-Id: I80b23b135ba218eb5b7ccc692f12140477bc7809
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 2181d06734..d6928c93e8 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -42,6 +42,8 @@ #include "qevent.h" #include "qcursor.h" #include "private/qguiapplication_p.h" +#include "qpa/qplatformintegration.h" +#include "qpa/qplatformdrag.h" #include "private/qevent_p.h" #include "private/qkeysequence_p.h" #include "qdebug.h" @@ -2252,7 +2254,7 @@ QDropEvent::QDropEvent(const QPointF& pos, Qt::DropActions actions, const QMimeD modState(modifiers), act(actions), mdata(data) { - default_action = Qt::CopyAction; // ### Qt5: QDragManager::self()->defaultAction(act, modifiers); + default_action = QGuiApplicationPrivate::platformIntegration()->drag()->defaultAction(act, modifiers); drop_action = default_action; ignore(); } |