diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-03 18:26:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 19:41:32 +0100 |
| commit | 321fcab5933d37ca9cb5097892621aa4979b45fa (patch) | |
| tree | 72c79563d195aa05d5ca23543aa275cf7e0fa424 /src/quick/items/qquickitem.cpp | |
| parent | 9ad9615d0003c9fb84255152f0cbb473ee2a7a70 (diff) | |
| parent | a79d616501f028183c154f175ec3ed0fa45ffd85 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index c11bf904be..a0329f7afc 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7012,7 +7012,10 @@ bool QQuickItem::event(QEvent *ev) } else #endif // QT_NO_IM if (ev->type() == QEvent::StyleAnimationUpdate) { - update(); + if (isVisible()) { + ev->accept(); + update(); + } return true; } return QObject::event(ev); |