diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-06-14 10:05:34 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 19:15:23 (GMT) |
| commit | 5a24211e0dab76b61a1631f0959274927ffe929d (patch) | |
| tree | 92ea6d74d47b103f8ae51b3538f01e8aa4816000 /src/gui | |
| parent | f44310c25b372f494586dbb5b305f7e81ca63000 (diff) | |
| download | Qt-5a24211e0dab76b61a1631f0959274927ffe929d.zip Qt-5a24211e0dab76b61a1631f0959274927ffe929d.tar.gz Qt-5a24211e0dab76b61a1631f0959274927ffe929d.tar.bz2 | |
Clean up a partially scrolled QRollEffect widget
If the associated widget pointer got zeroed while QRollEffect was
scrolling, the partially scrolled QRollEffect widget remained on
screen indefinitely as 'done' was never set to true.
Change-Id: If1567ea740e81b5501137d10db471ca97d295ed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from qtbase/486601fbc4a7e9eaeb5df5bb3966c3aec31d8d65)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qeffects.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qeffects.cpp b/src/gui/widgets/qeffects.cpp index ed80291..68b3192 100644 --- a/src/gui/widgets/qeffects.cpp +++ b/src/gui/widgets/qeffects.cpp @@ -532,7 +532,7 @@ void QRollEffect::scroll() setUpdatesEnabled(true); repaint(); } - if (done) { + if (done || !widget) { anim.stop(); qApp->removeEventFilter(this); if (widget) { |