diff options
17 files changed, 23 insertions, 21 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 */ diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml index 6006a5a4c0..ffe6583d2e 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml @@ -3,7 +3,7 @@ import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "arc"; when: windowShown function test_angle_1() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml index cc1d88672b..8609ad0332 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml @@ -3,7 +3,7 @@ import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "arcTo"; when: windowShown function test_coincide() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml index 348a7b3904..23d7b719ff 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml @@ -15,6 +15,8 @@ Rectangle { context.fillStyle = "red"; context.fillRect(0, 0, 100, 100); } + renderTarget:Canvas.Image + renderStrategy:Canvas.Threaded property int paintCount:spyPaint.count property int paintedCount:spyPainted.count property int canvasSizeChangedCount:spyCanvasSizeChanged.count diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml index 11e1dce902..bdc9d37663 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget:Canvas.Image + id:canvas; width:100;height:50; renderTarget:Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "composite"; when: windowShown function test_clearRect() { @@ -377,4 +377,4 @@ Canvas { } } -}
\ No newline at end of file +} diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_drawimage.qml b/tests/auto/quick/qquickcanvasitem/data/tst_drawimage.qml index 102217dc0c..75dd2b380c 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_drawimage.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_drawimage.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded Component.onCompleted: { canvas.loadImage('green.png'); canvas.loadImage('red.png'); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml b/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml index 8f5a78cec0..153a1034c1 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml @@ -3,7 +3,7 @@ import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:1;height:1;renderTarget:Canvas.Image + id:canvas; width:1;height:1;renderTarget:Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "fillStyle"; when: windowShown function test_default() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml b/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml index d454c2efe1..10ee6a6313 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "gradient"; when: windowShown function test_basic() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml index baf9987ce3..f1c2820734 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import"testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50;renderTarget: Canvas.Image + id:canvas; width:100;height:50;renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "line"; when: windowShown function test_default() { @@ -828,4 +828,4 @@ Canvas { } } -}
\ No newline at end of file +} diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml index b04ccf5458..6aaecbdfa5 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml @@ -3,7 +3,7 @@ import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "path"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml index dd5b6628e8..29c8bc97fc 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { //TODO name: "pattern"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml index 1a3793d7a3..8fd390a36a 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { //TODO name: "pixel"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml b/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml index 4405ca6c0e..bcb602a31a 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { //TODO diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_state.qml b/tests/auto/quick/qquickcanvasitem/data/tst_state.qml index 8042cf6a1d..def312d1e5 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_state.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_state.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { id:testCase name: "state"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml index 6b42f8a770..2521643837 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml @@ -3,7 +3,7 @@ import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget:Canvas.Image + id:canvas; width:100;height:50; renderTarget:Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "strokeStyle"; when: windowShown function test_default() { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml index baeb17c9fb..11618e95a9 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { //TODO name: "text"; when: windowShown diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml b/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml index 834a22f549..b8505c6452 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtTest 1.0 import "testhelper.js" as Helper Canvas { - id:canvas; width:100;height:50; renderTarget: Canvas.Image + id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded TestCase { name: "transform"; when: windowShown function test_order() { |