From 35313107982b65eee035b4c111db468bd75d072e Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@digia.com>
Date: Wed, 20 Mar 2013 10:19:38 +0100
Subject: Try to stabilize qquickimage and rendernode tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 tests/auto/quick/qquickimage/data/htiling.qml    |  2 +-
 tests/auto/quick/qquickimage/data/vtiling.qml    |  2 +-
 tests/auto/quick/rendernode/data/MessUpState.qml | 15 ++++++++-------
 tests/auto/quick/rendernode/data/RenderOrder.qml | 24 ++++++++++++------------
 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"
-- 
cgit v1.2.3