projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
4d763c3
)
Fix QSGItem::polish() at startup logic
author
Aaron Kennedy
<aaron.kennedy@nokia.com>
Fri, 26 Aug 2011 06:35:57 +0000 (16:35 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 29 Aug 2011 06:26:23 +0000 (08:26 +0200)
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>
src/declarative/items/qsgcanvas.cpp
patch
|
blob
|
history
diff --git
a/src/declarative/items/qsgcanvas.cpp
b/src/declarative/items/qsgcanvas.cpp
index
6873c41
..
4f1fcef
100644
(file)
--- 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;