diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-05-22 16:33:53 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-06-25 12:45:47 +0000 |
| commit | 7a7c722782a435f7c01b94f48df7a5f4ff4d599e (patch) | |
| tree | 63f1261126d502e05f0d396822ba6ebee4e1d323 /src/gui/kernel/qplatformintegration.cpp | |
| parent | ca3460775cadd055792457eab42bd8783b1df795 (diff) | |
dnd: send DragEnter and DragMove on DnD start
This was a regression from Qt4 and also is the documented behavior.
In addition this patch fixes various issues with cursor shape updating
that were discovered along the way and that are necessary for testing
the new changes.
The code in QGuiApplicationPrivate::processDrag() also needed a fixup,
particularly the resetting of QGuiApplicationPrivate::currentDragWindow.
Without this fix we would get DragMove (the one that immediately follows
the DragEnter) only for the first DragEnter event. For example when dnd
starts on mouse press then for mouse click we would get:
<click> DragEnter->DragMove->DragLeave <click> DragEnter->DragLeave
but the expected is:
<click> DragEnter->DragMove->DragLeave <click> DragEnter->DragMove->DragLeave
Task-number: QTBUG-34331
Change-Id: I3cc96c87d1fd5d1342c7f6c9438802ab30076e9e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformintegration.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index dfb8f60915..6e285a8fa5 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -99,8 +99,8 @@ QPlatformClipboard *QPlatformIntegration::clipboard() const /*! Accessor for the platform integration's drag object. - Default implementation returns 0, implying no drag and drop support. - + Default implementation returns QSimpleDrag. This class supports only drag + and drop operations within the same Qt application. */ QPlatformDrag *QPlatformIntegration::drag() const { |