diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2016-06-21 15:48:03 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2016-06-22 09:25:38 +0000 |
| commit | f54bd20f6afbbd7bcbc55b3f3f59ed15f91f8ecd (patch) | |
| tree | 317393e1fcfacfcd07de4155ed2998237c2eb382 /src/widgets/widgets/qdockwidget.cpp | |
| parent | 75926434070af2dc3b8f9f48329cb28211764db9 (diff) | |
Revert "End the drag if the dockwidget is being hidden"
This reverts commit 75b705fec8e9517047d7dfa98203edff69f2bf8a
and 798e0064e9be78f8320ff25a9af50d1b5e5badb1.
This broke drag and drop of QDockWidget if there is no animations
(QTBUG-54185) and this caused numerous crash with GrouppedDragging:
crashes when dropping on another floating QDockWidget, or when
dragging away.
The problem being that 'endDrag' would cause the QDockWidget to be hiden
temporarily and it would recurse into 'endDrag' and have unwanted effects
Task-number: QTBUG-54185
Change-Id: Icad9c6748448783e039bde205b60133f89f25e8e
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/widgets/widgets/qdockwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 6e6812aa1e..8b2e7a6660 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1445,8 +1445,6 @@ bool QDockWidget::event(QEvent *event) switch (event->type()) { #ifndef QT_NO_ACTION case QEvent::Hide: - if (d->state && d->state->dragging) - d->endDrag(true); if (layout != 0) layout->keepSize(this); d->toggleViewAction->setChecked(false); |