Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

27 files changed, 782 insertions, 44 deletions

diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml
index c2e3a81..03ede9c 100644
--- a/demos/declarative/calculator/CalcButton.qml
+++ b/demos/declarative/calculator/CalcButton.qml
@@ -9,7 +9,7 @@ Rectangle {
     id: button; width: 50; height: 30
     border.color: palette.mid; radius: 6
     gradient: Gradient {
-        GradientStop { id: G1; position: 0.0; color: palette.lighter(palette.button) }
+        GradientStop { id: G1; position: 0.0; color: Qt.lighter(palette.button) }
         GradientStop { id: G2; position: 1.0; color: palette.button }
     }
 
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 8041025..18ee5b9 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -3,7 +3,7 @@ import Qt 4.6
 Rectangle {
     width: 320; height: 270; color: palette.window
 
-    SystemPalette { id: palette; colorGroup: Qt.Active }
+    SystemPalette { id: palette }
     Script { source: "calculator.js" }
 
     Column {
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index 301124e..63cd555 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/content/Button.qml
@@ -8,7 +8,7 @@ Rectangle {
 
     color: activePalette.button; smooth: true
     width: txtItem.width + 20; height: txtItem.height + 6
-    border.width: 1; border.color: activePalette.darker(activePalette.button); radius: 8;
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
 
     gradient: Gradient {
         GradientStop {
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index 4560b56..19b929f 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -5,7 +5,7 @@ Rectangle {
     id: screen
     width: 490; height: 720
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
 
     Item {
         width: parent.width; anchors.top: parent.top; anchors.bottom: toolBar.top
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 80ec211..0551443 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -233,4 +233,25 @@
     \endqml
     \c Child1, \c Child2 and \c Child3 will all be added to the children list
     in the order in which they appear.
+
+    \target basicqmlvector3d
+    \section1 vector3d
+
+    A \c vector3d is specified in \c "x,y,z" format:
+
+    \qml
+    Rotation { angle: 60; axis: "0,1,0" }
+    \endqml
+
+    or with the \c{Qt.vector3d()} helper function:
+
+    \qml
+    Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) }
+    \endqml
+
+    or as separate \c x, \c y, and \c z components:
+
+    \qml
+    Rotation { angle: 60; axis.x: 0; axis.y: 1; axis.z: 0 }
+    \endqml
 */
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index 0166b4c..f420a1c 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -46,7 +46,7 @@ Item {
         ColorAnimation { duration: 3000 }
     }
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
 
     // toolbox
     Rectangle {
diff --git a/examples/declarative/dynamic/qml/Button.qml b/examples/declarative/dynamic/qml/Button.qml
index 2769cd8..cf2ffa7 100644
--- a/examples/declarative/dynamic/qml/Button.qml
+++ b/examples/declarative/dynamic/qml/Button.qml
@@ -6,7 +6,7 @@ Rectangle {
     property var text
     signal clicked
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
     height: text.height + 10
     width: text.width + 20
     border.width: 1
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index f2cbd3d..9139346 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -19,7 +19,7 @@ Rectangle {
         folder: "file:///E:/" // Documents on your S60 phone (or Windows E: drive)
     }
 
-    SystemPalette { id: palette; colorGroup: Qt.Active }
+    SystemPalette { id: palette }
 
     Script {
         function down(path) {
@@ -72,7 +72,7 @@ Rectangle {
                 anchors.fill: parent
                 gradient: Gradient {
                     GradientStop { id: t1; position: 0.0; color: palette.highlight }
-                    GradientStop { id: t2; position: 1.0; color: palette.lighter(palette.highlight) }
+                    GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
                 }
             }
             Item {
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index 3846cf7..9792a22 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -9,7 +9,7 @@ Rectangle {
 
     color: activePalette.button; smooth: true
     width: txtItem.width + 20; height: txtItem.height + 6
-    border.width: 1; border.color: activePalette.darker(activePalette.button); radius: 8;
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
 
     gradient: Gradient {
         GradientStop {
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index b5546d0..289579a 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -5,7 +5,7 @@ Rectangle {
     id: Screen
     width: 490; height: 720
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
 
     Item {
         width: parent.width; anchors.top: parent.top; anchors.bottom: ToolBar.top
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 2354218..9e515e0 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -8,7 +8,7 @@ Rectangle {
 
     color: activePalette.button; smooth: true
     width: txtItem.width + 20; height: txtItem.height + 6
-    border.width: 1; border.color: activePalette.darker(activePalette.button); radius: 8;
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
 
     gradient: Gradient {
         GradientStop {
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index 257e0de..e0e467a 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -4,7 +4,7 @@ Rectangle {
     id: Screen
     width: 490; height: 720
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
 //![2]
     Script { source: "samegame.js" }
 //![2]
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 2354218..9e515e0 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -8,7 +8,7 @@ Rectangle {
 
     color: activePalette.button; smooth: true
     width: txtItem.width + 20; height: txtItem.height + 6
-    border.width: 1; border.color: activePalette.darker(activePalette.button); radius: 8;
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
 
     gradient: Gradient {
         GradientStop {
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 0a7ec0f..e1eb542 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -5,7 +5,7 @@ Rectangle {
     id: Screen
     width: 490; height: 720
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
     Script { source: "samegame.js" }
 
     Item {
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 2354218..9e515e0 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -8,7 +8,7 @@ Rectangle {
 
     color: activePalette.button; smooth: true
     width: txtItem.width + 20; height: txtItem.height + 6
-    border.width: 1; border.color: activePalette.darker(activePalette.button); radius: 8;
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
 
     gradient: Gradient {
         GradientStop {
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index e519912..89dc945 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -7,7 +7,7 @@ Rectangle {
 
     Script { source: "content/samegame.js" }
 
-    SystemPalette { id: activePalette; colorGroup: Qt.Active }
+    SystemPalette { id: activePalette }
 
     Item {
         width: parent.width; anchors.top: parent.top; anchors.bottom: ToolBar.top
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
index bb3ec70..4ddc82d 100644
--- a/src/declarative/util/qmlsystempalette.cpp
+++ b/src/declarative/util/qmlsystempalette.cpp
@@ -256,39 +256,23 @@ QColor QmlSystemPalette::highlightedText() const
 }
 
 /*!
-    \qmlproperty color SystemPalette::lighter
-*/
-QColor QmlSystemPalette::lighter(const QColor& color) const
-{
-    return color.lighter();
-}
-
-/*!
-    \qmlproperty color SystemPalette::darker
-*/
-QColor QmlSystemPalette::darker(const QColor& color) const
-{
-    return color.darker();
-}
-
-/*!
-    \qmlproperty QPalette::ColorGroup SystemPalette::colorGroup
+    \qmlproperty QmlSystemPalette::ColorGroup SystemPalette::colorGroup
 
     The color group of the palette. It can be Active, Inactive or Disabled.
     Active is the default.
 
     \sa QPalette::ColorGroup
 */
-QPalette::ColorGroup QmlSystemPalette::colorGroup() const
+QmlSystemPalette::ColorGroup QmlSystemPalette::colorGroup() const
 {
     Q_D(const QmlSystemPalette);
-    return d->group;
+    return (QmlSystemPalette::ColorGroup)d->group;
 }
 
-void QmlSystemPalette::setColorGroup(QPalette::ColorGroup colorGroup)
+void QmlSystemPalette::setColorGroup(QmlSystemPalette::ColorGroup colorGroup)
 {
     Q_D(QmlSystemPalette);
-    d->group = colorGroup;
+    d->group = (QPalette::ColorGroup)colorGroup;
     emit paletteChanged();
 }
 
diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h
index e87534e..6abbfe0 100644
--- a/src/declarative/util/qmlsystempalette_p.h
+++ b/src/declarative/util/qmlsystempalette_p.h
@@ -56,9 +56,10 @@ class QmlSystemPalettePrivate;
 class Q_DECLARATIVE_EXPORT QmlSystemPalette : public QObject
 {
     Q_OBJECT
+    Q_ENUMS(ColorGroup)
     Q_DECLARE_PRIVATE(QmlSystemPalette)
 
-    Q_PROPERTY(QPalette::ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
+    Q_PROPERTY(QmlSystemPalette::ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
     Q_PROPERTY(QColor window READ window NOTIFY paletteChanged)
     Q_PROPERTY(QColor windowText READ windowText NOTIFY paletteChanged)
     Q_PROPERTY(QColor base READ base NOTIFY paletteChanged)
@@ -78,6 +79,8 @@ public:
     QmlSystemPalette(QObject *parent=0);
     ~QmlSystemPalette();
 
+    enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
+
     QColor window() const;
     QColor windowText() const;
 
@@ -97,12 +100,8 @@ public:
     QColor highlight() const;
     QColor highlightedText() const;
 
-    QPalette::ColorGroup colorGroup() const;
-    void setColorGroup(QPalette::ColorGroup);
-
-    // FIXME: Move to utility class?
-    Q_INVOKABLE QColor lighter(const QColor&) const;
-    Q_INVOKABLE QColor darker(const QColor&) const;
+    QmlSystemPalette::ColorGroup colorGroup() const;
+    void setColorGroup(QmlSystemPalette::ColorGroup);
 
 Q_SIGNALS:
     void paletteChanged();
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index e586925..02d5a55 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -31,6 +31,7 @@ SUBDIRS += \
            qmlpixmapcache \         # Cover
            qmlpropertymap \         # Cover
            qmlqt \                  # Cover
+           qmlsystempalette \       # Cover
            qmltimer \               # Cover
            qmlxmllistmodel \        # Cover
            repeater \               # Cover
diff --git a/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro b/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
new file mode 100644
index 0000000..4d55b46
--- /dev/null
+++ b/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmlsystempalette.cpp
diff --git a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp b/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
new file mode 100644
index 0000000..039eaa8
--- /dev/null
+++ b/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qmlcomponent.h>
+#include <private/qmlsystempalette_p.h>
+#include <qpalette.h>
+#include "../../../shared/util.h"
+
+class tst_qmlsystempalette : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qmlsystempalette();
+
+private slots:
+    void activePalette();
+    void inactivePalette();
+    void disabledPalette();
+
+private:
+    QmlEngine engine;
+};
+
+tst_qmlsystempalette::tst_qmlsystempalette()
+{
+}
+
+void tst_qmlsystempalette::activePalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { }";
+    QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://"));
+    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Active);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+void tst_qmlsystempalette::inactivePalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }";
+    QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://"));
+    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Inactive);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+void tst_qmlsystempalette::disabledPalette()
+{
+    QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }";
+    QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://"));
+    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+
+    QVERIFY(object != 0);
+
+    QPalette palette;
+    palette.setCurrentColorGroup(QPalette::Disabled);
+    QCOMPARE(palette.window().color(), object->window());
+    QCOMPARE(palette.windowText().color(), object->windowText());
+    QCOMPARE(palette.base().color(), object->base());
+    QCOMPARE(palette.text().color(), object->text());
+    QCOMPARE(palette.alternateBase().color(), object->alternateBase());
+    QCOMPARE(palette.button().color(), object->button());
+    QCOMPARE(palette.buttonText().color(), object->buttonText());
+    QCOMPARE(palette.light().color(), object->light());
+    QCOMPARE(palette.midlight().color(), object->midlight());
+    QCOMPARE(palette.dark().color(), object->dark());
+    QCOMPARE(palette.mid().color(), object->mid());
+    QCOMPARE(palette.shadow().color(), object->shadow());
+    QCOMPARE(palette.highlight().color(), object->highlight());
+    QCOMPARE(palette.highlightedText().color(), object->highlightedText());
+
+    delete object;
+}
+
+QTEST_MAIN(tst_qmlsystempalette)
+
+#include "tst_qmlsystempalette.moc"
diff --git a/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.0.png b/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.0.png
new file mode 100644
index 0000000..9c9ceae
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.0.png
diff --git a/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.qml b/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.qml
new file mode 100644
index 0000000..7ac6f51
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/data-MAC/fillmode.qml
@@ -0,0 +1,279 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 32
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 48
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 64
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 80
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 96
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 112
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 128
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 144
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 160
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 176
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 192
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 208
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 224
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 240
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 256
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 272
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 288
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 304
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 320
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 336
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 352
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 368
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 384
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 400
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 416
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 432
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 448
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 464
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 480
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 496
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 512
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 528
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 544
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 560
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 576
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 592
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 608
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 624
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 640
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 656
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 672
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 688
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 704
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 736
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 752
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 768
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 784
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 800
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 816
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 832
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 848
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 864
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 880
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 896
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 912
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 928
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 944
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 960
+        image: "fillmode.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 992
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1008
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1024
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1040
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1056
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+}
diff --git a/tests/auto/declarative/visual/fillmode/data/fillmode.0.png b/tests/auto/declarative/visual/fillmode/data/fillmode.0.png
new file mode 100644
index 0000000..9c9ceae
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/data/fillmode.0.png
diff --git a/tests/auto/declarative/visual/fillmode/data/fillmode.qml b/tests/auto/declarative/visual/fillmode/data/fillmode.qml
new file mode 100644
index 0000000..58af8e8
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/data/fillmode.qml
@@ -0,0 +1,279 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 32
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 48
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 64
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 80
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 96
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 112
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 128
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 144
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 160
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 176
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 192
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 208
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 224
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 240
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 256
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 272
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 288
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 304
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 320
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 336
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 352
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 368
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 384
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 400
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 416
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 432
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 448
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 464
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 480
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 496
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 512
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 528
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 544
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 560
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 576
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 592
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 608
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 624
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 640
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 656
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 672
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 688
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 704
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 720
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 736
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 752
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 768
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 784
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 800
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 816
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 832
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 848
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 864
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 880
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 896
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 912
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 928
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 944
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 960
+        image: "fillmode.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 992
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1008
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1024
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1040
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+    Frame {
+        msec: 1056
+        hash: "c8cb8d51ca04231dc272133faaf2fb6d"
+    }
+}
diff --git a/tests/auto/declarative/visual/fillmode/face.png b/tests/auto/declarative/visual/fillmode/face.png
new file mode 100644
index 0000000..9623b1a
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/face.png
diff --git a/tests/auto/declarative/visual/fillmode/fillmode.qml b/tests/auto/declarative/visual/fillmode/fillmode.qml
new file mode 100644
index 0000000..8450bf2
--- /dev/null
+++ b/tests/auto/declarative/visual/fillmode/fillmode.qml
@@ -0,0 +1,16 @@
+import Qt 4.6
+
+Rectangle {
+    id: screen; width: 750; height: 600; color: "gray"
+    property string source: "face.png"
+
+    Grid {
+        columns: 3
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.Stretch }
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.PreserveAspectFit; smooth: true }
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.PreserveAspectCrop }
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.Tile; smooth: true }
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.TileHorizontally }
+        Image { width: 250; height: 300; source: screen.source; fillMode: Image.TileVertically }
+    }
+}