aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-03-20 10:19:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-20 12:29:15 +0100
commit99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (patch)
tree3112c56dc0771697bde15cdc19a7246adbd8096b
parent9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff)
Try to stabilize qquickimage and rendernode tests.
Some of Our CI machines are running on tiny screens and recent changes in Qt have caused us to limit windows to the screen geometry (which is sensible). Change-Id: I29eb3b5c73a7ea650ac26494c25d204fb254dee3 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
-rw-r--r--tests/auto/quick/qquickimage/data/htiling.qml2
-rw-r--r--tests/auto/quick/qquickimage/data/vtiling.qml2
-rw-r--r--tests/auto/quick/rendernode/data/MessUpState.qml15
-rw-r--r--tests/auto/quick/rendernode/data/RenderOrder.qml24
4 files changed, 22 insertions, 21 deletions
diff --git a/tests/auto/quick/qquickimage/data/htiling.qml b/tests/auto/quick/qquickimage/data/htiling.qml
index 60ee7b35eb..eb7222a767 100644
--- a/tests/auto/quick/qquickimage/data/htiling.qml
+++ b/tests/auto/quick/qquickimage/data/htiling.qml
@@ -1,7 +1,7 @@
import QtQuick 2.0
Rectangle {
- width: 200; height: 480
+ width: 200; height: 200
Image {
objectName: "tiling"; anchors.fill: parent
diff --git a/tests/auto/quick/qquickimage/data/vtiling.qml b/tests/auto/quick/qquickimage/data/vtiling.qml
index f730f6e050..84bb18c6e8 100644
--- a/tests/auto/quick/qquickimage/data/vtiling.qml
+++ b/tests/auto/quick/qquickimage/data/vtiling.qml
@@ -1,7 +1,7 @@
import QtQuick 2.0
Rectangle {
- width: 550; height: 200
+ width: 200; height: 200
Image {
objectName: "tiling"; anchors.fill: parent
diff --git a/tests/auto/quick/rendernode/data/MessUpState.qml b/tests/auto/quick/rendernode/data/MessUpState.qml
index b9c2a59446..84f32b7692 100644
--- a/tests/auto/quick/rendernode/data/MessUpState.qml
+++ b/tests/auto/quick/rendernode/data/MessUpState.qml
@@ -2,18 +2,19 @@ import QtQuick 2.0
import Test 1.0
Rectangle {
- width: 320
- height: 480
+ id: root
+ width: 160
+ height: 240
color: "black"
Rectangle {
- width: 320
- height: 240
+ width: root.width
+ height: root.height / 2;
anchors.centerIn: parent
clip: true
color: "white"
Rectangle {
- width: 160
- height: 240
+ width: root.width / 2;
+ height: root.height / 2
anchors.centerIn: parent
rotation: 45
color: "blue"
@@ -23,7 +24,7 @@ Rectangle {
}
Rectangle {
anchors.fill: parent
- anchors.margins: -50
+ anchors.margins: -100
color: "red"
opacity: 0.5
}
diff --git a/tests/auto/quick/rendernode/data/RenderOrder.qml b/tests/auto/quick/rendernode/data/RenderOrder.qml
index 6452b78dea..739aa9cc06 100644
--- a/tests/auto/quick/rendernode/data/RenderOrder.qml
+++ b/tests/auto/quick/rendernode/data/RenderOrder.qml
@@ -4,13 +4,13 @@ import Test 1.0
Rectangle {
id: root
- width: 320
- height: 480
+ width: 160
+ height: 240
color: "black"
Rectangle {
- width: 160
- height: 240
+ width: root.width / 2
+ height: root.height / 2
anchors.top: parent.top
anchors.left: parent.left
color: "red"
@@ -18,32 +18,32 @@ Rectangle {
}
Rectangle {
- width: 160
- height: 240
+ width: root.width / 2
+ height: root.height / 2
anchors.bottom: parent.bottom
anchors.left: parent.left
color: "red"
}
ClearItem {
- width: 160
- height: 240
+ width: root.width / 2
+ height: root.height / 2
anchors.centerIn: parent
color: "white"
clip: true
}
Rectangle {
- width: 160
- height: 240
+ width: root.width / 2
+ height: root.height / 2
anchors.top: parent.top
anchors.right: parent.right
color: "blue"
}
Rectangle {
- width: 160
- height: 240
+ width: root.width / 2
+ height: root.height / 2
anchors.bottom: parent.bottom
anchors.right: parent.right
color: "blue"