diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-02-27 14:54:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 00:02:38 +0100 |
| commit | 24d5fe8113ed149b98c0718aa3b27d3b013577cc (patch) | |
| tree | a176eb26c5e29adfc4af50acc35dec0613dade0e /src/quick/items/qquickitem.cpp | |
| parent | 553530fb0a202ba7adaa2521fc180068f98c9c20 (diff) | |
Revert "Fix item polishing"
This caused items like positioners and itemviews to not
relayout or update as appropriate when items were hidden,
and therefore caused problems all over in eg. controls.
This reverts commits
- 43f983350a548b1b663ea07a0e87e4cc58834214
- 01e609e9fa0ca1317e0f4eff4802a79584450357
- 439f31f128e70ecae16544ee7041695c60e0b2d6
Task-number: QTBUG-36954
Task-number: QTBUG-36934
Task-number: QTBUG-31830
Change-Id: If04cdce51206568c360a45e24efc0bd04764750b
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 62ed5e0c85..3b63028a2e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3857,7 +3857,7 @@ void QQuickItem::polish() Q_D(QQuickItem); if (!d->polishScheduled) { d->polishScheduled = true; - if (d->window && (isVisible() || (d->extra.isAllocated() && d->extra->effectRefCount>0))) { + if (d->window) { QQuickWindowPrivate *p = QQuickWindowPrivate::get(d->window); bool maybeupdate = p->itemsToPolish.isEmpty(); p->itemsToPolish.insert(this); @@ -5241,8 +5241,6 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible) QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window); if (windowPriv->mouseGrabberItem == q) q->ungrabMouse(); - if (polishScheduled) - windowPriv->itemsToPolish.insert(q); } bool childVisibilityChanged = false; |