aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-06-21 15:31:40 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-06-21 15:31:40 +1000
commit576ba2e1c5b7867545ea25feff3354c61c485f8a (patch)
tree016e9cdbbd96f4d0dfa9b4d846127ab3f0bf42c9
parent222b1e0784b0cdfe2933235a62823c5342618f14 (diff)
parent275384fcb5da79742cd427f5ab5ae881cd7bb56a (diff)
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
-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 30dc5cab02..a27b14bcbf 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -2001,7 +2001,9 @@ QImage QSGCanvas::grabFrameBuffer()
void QSGCanvasRenderThread::run()
{
+#ifdef THREAD_DEBUG
qDebug("QML Rendering Thread Started");
+#endif
renderer->makeCurrent();