summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-08-26 16:35:57 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-29 08:26:23 +0200
commitb016460dc49c0ea5a1ed54c71f47ba52819921a8 (patch)
treefdcc481c6d1e65e588aaadc2b03b5fe1b90e3433
parent4d763c3d9f26da034495b98fe829b88fed34a22c (diff)
Fix QSGItem::polish() at startup logic
Change-Id: I4e3f81bd8e95d34fe59e39b1ae807211e00aaaa5 Reviewed-on: http://codereview.qt.nokia.com/3632 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
-rw-r--r--src/declarative/items/qsgcanvas.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index 6873c41cef..4f1fcefee4 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -975,6 +975,8 @@ bool QSGCanvas::event(QEvent *e)
if (e->type() == QEvent::User) {
if (!d->thread->syncAlreadyHappened)
d->thread->sync(false);
+ else
+ d->renderThreadAwakened = false;
d->thread->syncAlreadyHappened = false;