From 632016368e26ba06d7d09740a8a1805f4ea911f1 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Fri, 17 Dec 2010 15:24:30 +1000
Subject: Update test bitmaps for QDeclarativeImage::svg() autotest on Linux

Task-number:
Reviewed-by: Martin Jones
---
 .../declarative/qdeclarativeimage/data/heart.png    | Bin 12424 -> 12577 bytes
 .../declarative/qdeclarativeimage/data/heart200.png | Bin 7943 -> 8063 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.png b/tests/auto/declarative/qdeclarativeimage/data/heart.png
index ff93f6c..abe97fe 100644
Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart.png and b/tests/auto/declarative/qdeclarativeimage/data/heart.png differ
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png
index 5a31ae8..7fbb13c 100644
Binary files a/tests/auto/declarative/qdeclarativeimage/data/heart200.png and b/tests/auto/declarative/qdeclarativeimage/data/heart200.png differ
-- 
cgit v0.12


From e0abcb2ff7a3044305580659f9a432a9630a5943 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Fri, 17 Dec 2010 16:18:03 +1000
Subject: Fix QDeclarativeState::reset() autotest

Current state reset mechanism does not really work for Text elements as the keeping implicit correct would require relayouting of text twice (See bug QTBUG-15118). Changed QDeclarativeState reset autotest to use Image element instead of Text element until the issue has been fixed.

Task-number:
Reviewed-by: Yann Bodson
---
 tests/auto/declarative/qdeclarativestates/data/image.png  | Bin 0 -> 173 bytes
 tests/auto/declarative/qdeclarativestates/data/reset.qml  |   9 ++++-----
 .../qdeclarativestates/tst_qdeclarativestates.cpp         |  13 ++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/image.png

diff --git a/tests/auto/declarative/qdeclarativestates/data/image.png b/tests/auto/declarative/qdeclarativestates/data/image.png
new file mode 100644
index 0000000..ed1833c
Binary files /dev/null and b/tests/auto/declarative/qdeclarativestates/data/image.png differ
diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/declarative/qdeclarativestates/data/reset.qml
index 8799c97..a140ffa 100644
--- a/tests/auto/declarative/qdeclarativestates/data/reset.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/reset.qml
@@ -3,17 +3,16 @@ import QtQuick 1.0
 Rectangle {
     width: 640
     height: 480
-    Text {
-        id: theText
+    Image {
+        id: image
         width: 40
-        wrapMode: Text.WordWrap
-        text: "a text string that is longer than 40 pixels"
+        source: "image.png"
     }
 
     states: State {
         name: "state1"
         PropertyChanges {
-            target: theText
+            target: image
             width: undefined
         }
     }
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index b8409a5..870842c 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -44,7 +44,6 @@
 #include <private/qdeclarativeanchors_p_p.h>
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativeimage_p.h>
-#include <private/qdeclarativetext_p.h>
 #include <private/qdeclarativepropertychanges_p.h>
 #include <private/qdeclarativestategroup_p.h>
 #include <private/qdeclarativeitem_p.h>
@@ -1126,15 +1125,15 @@ void tst_qdeclarativestates::reset()
     QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect != 0);
 
-    QDeclarativeText *text = rect->findChild<QDeclarativeText*>();
-    QVERIFY(text != 0);
-    QCOMPARE(text->width(), qreal(40.));
-    QVERIFY(text->width() < text->height());
+    QDeclarativeImage *image = rect->findChild<QDeclarativeImage*>();
+    QVERIFY(image != 0);
+    QCOMPARE(image->width(), qreal(40.));
+    QCOMPARE(image->height(), qreal(20.));
 
     QDeclarativeItemPrivate::get(rect)->setState("state1");
 
-    QVERIFY(text->width() > 41);
-    QVERIFY(text->width() > text->height());
+    QCOMPARE(image->width(), 20.0);
+    QCOMPARE(image->height(), qreal(20.));
 }
 
 void tst_qdeclarativestates::illegalObjectCreation()
-- 
cgit v0.12