diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-10 13:35:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-23 06:35:47 +0000 |
| commit | 6f65ddbc217a8c82b091d31e88faf3dc23baa13b (patch) | |
| tree | 8320cf82311bb06368fe64b7f0768d3604340be0 /src/gui/kernel/qsimpledrag_p.h | |
| parent | 746fbbe03926b8741fefab846638c09603424063 (diff) | |
Implement canceling of Qt-initiated drags.
- Add new virtual QPlatformDrag::cancelDrag()
[avoiding a conflict with existing QBasicDrag::cancel()]
- Implement on Windows by returning DRAGDROP_S_CANCEL
from IOleDropSource::QueryContinueDrag() as suggested on report.
- Implement in QBasicDrag by calling QBasicDrag::cancel()
and quitting the event loop.
- Add new API static void QDrag::cancel() for it.
Task-number: QTBUG-47004
Change-Id: I4b4bb52e5fc226c8e04688ac1b0f9550daaf918e
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/gui/kernel/qsimpledrag_p.h')
| -rw-r--r-- | src/gui/kernel/qsimpledrag_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h index 4c9edbae05..34679a7540 100644 --- a/src/gui/kernel/qsimpledrag_p.h +++ b/src/gui/kernel/qsimpledrag_p.h @@ -66,6 +66,7 @@ public: virtual ~QBasicDrag(); virtual Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE; + void cancelDrag() Q_DECL_OVERRIDE; virtual bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; |