aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickimage
diff options
context:
space:
mode:
authorGlenn Watson <glenn.watson@nokia.com>2012-07-13 13:52:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-16 00:36:19 +0200
commitc87df269c0590f5d0b9837d539a5c119e401b750 (patch)
tree399dda51dbe0ba0d610a6f7fd5b2a06e82804382 /tests/auto/quick/qquickimage
parentcb86525df6e4721cd150dea2a2f93d1bf54f478f (diff)
Fix auto test for tiling image.
The test was using a resolution that was too high for some of the CI machines. Changing the height to 480 is still high enough to test the tiling functionality. Task-number: QTBUG-26480 Change-Id: I40c731ae316471aeeafc8762a2d258adb2239c7b Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickimage')
-rw-r--r--tests/auto/quick/qquickimage/data/htiling.qml2
-rw-r--r--tests/auto/quick/qquickimage/qquickimage.pro1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickimage/data/htiling.qml b/tests/auto/quick/qquickimage/data/htiling.qml
index f192f931c9..60ee7b35eb 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: 550
+ width: 200; height: 480
Image {
objectName: "tiling"; anchors.fill: parent
diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro
index a4e5db40a2..5b1059bd24 100644
--- a/tests/auto/quick/qquickimage/qquickimage.pro
+++ b/tests/auto/quick/qquickimage/qquickimage.pro
@@ -12,4 +12,3 @@ include (../shared/util.pri)
TESTDATA = data/*
QT += core-private gui-private qml-private quick-private network testlib
-linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):CONFIG += insignificant_test