aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2012-03-07 09:28:27 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-07 05:03:52 +0100
commit2df64d04bee04b9a30d6d62582199cc9ec524632 (patch)
tree225e24db9bff8407b5b164cb725db75519e54758 /src/quick/items/context2d
parentcc6556c62c2e06f6d0b15383165772d06aa26066 (diff)
Change the default renderTarget and renderStrategy
As we always use OpenGL and scenegraph render thread now, the best default render target should be FBO and the best render strategy should be cooperative mode (use the render thread). Task-number:QTBUG-23956 Change-Id: I64b070dec566e359d27c84680fef1c691d6ce411 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/context2d')
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index ed16ea0f38..f89ac186eb 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -86,8 +86,8 @@ QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
, hasCanvasWindow(false)
, available(false)
, contextInitialized(false)
- , renderTarget(QQuickCanvasItem::Image)
- , renderStrategy(QQuickCanvasItem::Threaded)
+ , renderTarget(QQuickCanvasItem::FramebufferObject)
+ , renderStrategy(QQuickCanvasItem::Cooperative)
{
}
@@ -379,7 +379,7 @@ void QQuickCanvasItem::setCanvasWindow(const QRectF& rect)
context will choose appropriate options and Canvas will signal the change
to the properties.
- The default render target is \c Canvas.Image.
+ The default render target is \c Canvas.FramebufferObject.
*/
QQuickCanvasItem::RenderTarget QQuickCanvasItem::renderTarget() const
{
@@ -419,7 +419,7 @@ void QQuickCanvasItem::setRenderTarget(QQuickCanvasItem::RenderTarget target)
the GUI thread. Selecting \c Canvas.Cooperative, does not guarantee
rendering will occur on a thread separate from the GUI thread.
- The default value is \c Canvas.Threaded.
+ The default value is \c Canvas.Cooperative.
\sa QtQuick2::Canvas::renderTarget
*/