qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure polish() is reentrant. 

Take a copy of the items currently scheduled for polish (and clear the internal
list) to ensure an item can re-add itself to the polish list during an
updatePolish().

Change-Id: I0c629795f64d5926ac87a838ea5e216b6a1fa6cf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Justin McPherson 2012-02-07 15:31:28 +10:00 committed by Qt by Nokia
parent e99c5a3f11
commit a60635a3cf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/quick/items/qquickcanvas.cpp
View File

@ -197,10 +197,11 @@ void QQuickCanvas::focusInEvent(QFocusEvent *)
void QQuickCanvasPrivate::polishItems()
{
while (!itemsToPolish.isEmpty()) {
QSet<QQuickItem *>::Iterator iter = itemsToPolish.begin();
QQuickItem *item = *iter;
itemsToPolish.erase(iter);
QSet<QQuickItem *> itms = itemsToPolish;
itemsToPolish.clear();
for (QSet<QQuickItem *>::iterator it = itms.begin(); it != itms.end(); ++it) {
QQuickItem *item = *it;
QQuickItemPrivate::get(item)->polishScheduled = false;
item->updatePolish();
}