aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-02-04 11:37:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-04 14:45:33 +0100
commit48144d3b29a1204bf1820d782228fbd9e25f318e (patch)
treed9a475c156b5809c7f465b8f0affda8cbc50c0e8 /tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
parentc6da58a295235c89ee2a5847b15cb0b1dc66b2f4 (diff)
Fix canvas tests after commit 439f31f128e70ecae16544ee7041695c60e0b2d6
We must make sure that the canvas is created somewhere in the item hierarchy of a scene-graph initialized (thus visible) window. A Window { visible: true } type of item is not sufficient, but we can simply use our testcase as parent/associated item, because that one is equipped with a when: windowShown condition. Change-Id: I67a65208fae1a6fd953493eaa2898a324a6cc917 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml')
-rw-r--r--tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
index c658f35d1f..e299147b36 100644
--- a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml
@@ -11,10 +11,6 @@ TestCase {
function cleanupTestCase() {
wait(100) //wait for a short while to make sure no leaked textures
}
- Window {
- id: win
- visible: true
- }
function testData(type) {
if (type === "2d")
@@ -31,7 +27,7 @@ TestCase {
}
function createCanvasObject(data) {
- return component.createObject(win, data.properties);
+ return component.createObject(testCase, data.properties);
}
function comparePixel(ctx,x,y,r,g,b,a, d)