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

15 files changed, 784 insertions, 165 deletions

diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml
deleted file mode 100644
index 31c75e1..0000000
--- a/examples/declarative/animation/animation.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    width: 400
-    height: 200
-    color: "white"
-
-    Rectangle {
-        width: 40
-        height: 40
-        y: 80
-        color: "#FF0000"
-        radius: 10
-
-        // Animate the x property.  Setting repeat to true makes the
-        // animation repeat indefinitely, otherwise it would only run once.
-        x: SequentialAnimation {
-            running: true
-            repeat: true
-
-            // Move from 0 to 360 in 500ms, using the easeInOutQuad easing function
-            NumberAnimation {
-                from: 0
-                to: 360
-                easing: "easeInOutQuad"
-                duration: 500
-            }
-            
-            // Then pause for 200ms
-            PauseAnimation {
-                duration: 200
-            }
-
-            // Then move back to 0 in 2 seconds, using the easeInOutElastic easing function
-            NumberAnimation {
-                from: 360
-                to: 0
-                easing: "easeInOutElastic"
-                duration: 2000
-            }
-        }
-
-        // Alternate color between red and green
-        color: SequentialAnimation {
-            running: true
-            repeat: true
-
-            ColorAnimation {
-                property: "color"
-                from: "#FF0000"
-                to: "#00FF00"
-                duration: 5000
-            }
-
-            ColorAnimation {
-                property: "color"
-                from: "#00FF00"
-                to: "#FF0000"
-                duration: 5000
-            }
-        }
-    }
-}
diff --git a/examples/declarative/animation/color-animation.qml b/examples/declarative/animation/color-animation.qml
new file mode 100644
index 0000000..ec3f90f
--- /dev/null
+++ b/examples/declarative/animation/color-animation.qml
@@ -0,0 +1,72 @@
+import Qt 4.6
+
+Item {
+    id: window
+    width: 640; height: 480
+
+    // Let's draw the sky...
+    Rectangle {
+        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
+        gradient: Gradient {
+            GradientStop {
+                position: 0.0
+                color: SequentialAnimation {
+                    running: true; repeat: true
+                    ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 }
+                    ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 }
+                }
+            }
+            GradientStop {
+                position: 1.0
+                color: SequentialAnimation {
+                    running: true; repeat: true
+                    ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 }
+                    ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 }
+                }
+            }
+        }
+        Particles {
+            anchors.fill: parent; source: "images/star.png"; angleDeviation: 360; velocity: 0
+            velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800
+            opacity: SequentialAnimation {
+                running: true; repeat: true
+                NumberAnimation { from: 0; to: 1; duration: 5000 }
+                NumberAnimation { from: 1; to: 0; duration: 5000 }
+            }
+        }
+    }
+
+    // the sun and the moon
+    Item {
+        width: parent.width; height: 2 * parent.height
+        transformOrigin: "Center"
+        rotation: SequentialAnimation {
+            running: true; repeat: true
+            NumberAnimation { from: 0; to: 360; duration: 10000 }
+        }
+        Image {
+            source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
+            transformOrigin: "Center"; rotation: -3 * parent.rotation
+        }
+        Image {
+            source: "images/moon.png"; y: parent.height - 74; anchors.horizontalCenter: parent.horizontalCenter
+            transformOrigin: "Center"; rotation: -parent.rotation
+        }
+    }
+
+    // ...and the ground.
+    Rectangle {
+        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
+        gradient: Gradient {
+            GradientStop {
+                position: 0.0
+                color: SequentialAnimation {
+                    running: true; repeat: true
+                    ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 }
+                    ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 }
+                }
+            }
+            GradientStop { position: 1.0; color: "DarkGreen" }
+        }
+    }
+}
diff --git a/examples/declarative/animation/easing.qml b/examples/declarative/animation/easing.qml
new file mode 100644
index 0000000..9e0a0d6
--- /dev/null
+++ b/examples/declarative/animation/easing.qml
@@ -0,0 +1,99 @@
+import Qt 4.6
+
+Rectangle {
+    id: window
+    width: 600; height: 460; color: "#232323"
+
+    ListModel {
+        id: easingTypes
+        ListElement { type: "easeLinear"; ballColor: "DarkRed" }
+        ListElement { type: "easeInQuad"; ballColor: "IndianRed" }
+        ListElement { type: "easeOutQuad"; ballColor: "Salmon" }
+        ListElement { type: "easeInOutQuad"; ballColor: "Tomato" }
+        ListElement { type: "easeOutInQuad"; ballColor: "DarkOrange" }
+        ListElement { type: "easeInCubic"; ballColor: "Gold" }
+        ListElement { type: "easeOutCubic"; ballColor: "Yellow" }
+        ListElement { type: "easeInOutCubic"; ballColor: "PeachPuff" }
+        ListElement { type: "easeOutInCubic"; ballColor: "Thistle" }
+        ListElement { type: "easeInQuart"; ballColor: "Orchid" }
+        ListElement { type: "easeOutQuart"; ballColor: "Purple" }
+        ListElement { type: "easeInOutQuart"; ballColor: "SlateBlue" }
+        ListElement { type: "easeOutInQuart"; ballColor: "Chartreuse" }
+        ListElement { type: "easeInQuint"; ballColor: "LimeGreen" }
+        ListElement { type: "easeOutQuint"; ballColor: "SeaGreen" }
+        ListElement { type: "easeInOutQuint"; ballColor: "DarkGreen" }
+        ListElement { type: "easeOutInQuint"; ballColor: "Olive" }
+        ListElement { type: "easeInSine"; ballColor: "DarkSeaGreen" }
+        ListElement { type: "easeOutSine"; ballColor: "Teal" }
+        ListElement { type: "easeInOutSine"; ballColor: "Turquoise" }
+        ListElement { type: "easeOutInSine"; ballColor: "SteelBlue" }
+        ListElement { type: "easeInExpo"; ballColor: "SkyBlue" }
+        ListElement { type: "easeOutExpo"; ballColor: "RoyalBlue" }
+        ListElement { type: "easeInOutExpo"; ballColor: "MediumBlue" }
+        ListElement { type: "easeOutInExpo"; ballColor: "MidnightBlue" }
+        ListElement { type: "easeInCirc"; ballColor: "CornSilk" }
+        ListElement { type: "easeOutCirc"; ballColor: "Bisque" }
+        ListElement { type: "easeInOutCirc"; ballColor: "RosyBrown" }
+        ListElement { type: "easeOutInCirc"; ballColor: "SandyBrown" }
+        ListElement { type: "easeInElastic"; ballColor: "DarkGoldenRod" }
+        ListElement { type: "easeOutElastic"; ballColor: "Chocolate" }
+        ListElement { type: "easeInOutElastic"; ballColor: "SaddleBrown" }
+        ListElement { type: "easeOutInElastic"; ballColor: "Brown" }
+        ListElement { type: "easeInBack"; ballColor: "Maroon" }
+        ListElement { type: "easeOutBack"; ballColor: "LavenderBlush" }
+        ListElement { type: "easeInOutBack"; ballColor: "MistyRose" }
+        ListElement { type: "easeOutInBack"; ballColor: "Gainsboro" }
+        ListElement { type: "easeOutBounce"; ballColor: "Silver" }
+        ListElement { type: "easeInBounce"; ballColor: "DimGray" }
+        ListElement { type: "easeInOutBounce"; ballColor: "SlateGray" }
+        ListElement { type: "easeOutInBounce"; ballColor: "DarkSlateGray" }
+    }
+
+    Component {
+        id: delegate
+
+        Item {
+            height: 42; width: window.width
+            Text { text: type; anchors.centerIn: parent; color: "White" }
+            Rectangle {
+                id: slot1; color: "#121212"; x: 30; height: 32; width: 32
+                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+            }
+            Rectangle {
+                id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
+                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+            }
+            Rectangle {
+                id: rect; x: 30; color: "#454545"
+                border.color: "White"; border.width: 2
+                height: 32; width: 32; radius: 8; anchors.verticalCenter: parent.verticalCenter
+
+                MouseRegion {
+                    onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
+                    anchors.fill: parent
+                }
+
+                states : State {
+                    name: "right"
+                    PropertyChanges { target: rect; x: window.width - 62; color: ballColor }
+                }
+
+                transitions: Transition {
+                    ParallelAnimation {
+                        NumberAnimation { properties: "x"; easing: type; duration: 1000 }
+                        ColorAnimation { properties: "color"; easing: type; duration: 1000 }
+                    }
+                }
+            }
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent; viewportHeight: layout.height
+        Column {
+            id: layout
+            anchors.left: window.left; anchors.right: window.right
+            Repeater { model: easingTypes; delegate: delegate }
+        }
+    }
+}
diff --git a/examples/declarative/animation/images/face-smile.png b/examples/declarative/animation/images/face-smile.png
new file mode 100644
index 0000000..3d66d72
--- /dev/null
+++ b/examples/declarative/animation/images/face-smile.png
diff --git a/examples/declarative/animation/images/moon.png b/examples/declarative/animation/images/moon.png
new file mode 100644
index 0000000..9407b2b
--- /dev/null
+++ b/examples/declarative/animation/images/moon.png
diff --git a/examples/declarative/animation/images/shadow.png b/examples/declarative/animation/images/shadow.png
new file mode 100644
index 0000000..8270565
--- /dev/null
+++ b/examples/declarative/animation/images/shadow.png
diff --git a/examples/declarative/animation/images/star.png b/examples/declarative/animation/images/star.png
new file mode 100644
index 0000000..27ef924
--- /dev/null
+++ b/examples/declarative/animation/images/star.png
diff --git a/examples/declarative/animation/images/sun.png b/examples/declarative/animation/images/sun.png
new file mode 100644
index 0000000..7713ca5
--- /dev/null
+++ b/examples/declarative/animation/images/sun.png
diff --git a/examples/declarative/animation/property-animation.qml b/examples/declarative/animation/property-animation.qml
new file mode 100644
index 0000000..4e0f6f4
--- /dev/null
+++ b/examples/declarative/animation/property-animation.qml
@@ -0,0 +1,64 @@
+import Qt 4.6
+
+Item {
+    id: window
+    width: 320; height: 480
+
+    // Let's draw the sky...
+    Rectangle {
+        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "DeepSkyBlue" }
+            GradientStop { position: 1.0; color: "LightSkyBlue" }
+        }
+    }
+
+    // ...and the ground.
+    Rectangle {
+        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "ForestGreen" }
+            GradientStop { position: 1.0; color: "DarkGreen" }
+        }
+    }
+
+    // The shadow for the smiley face
+    Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "images/shadow.png"; y: smiley.minHeight + 58
+        transformOrigin: "Center"
+
+        // The scale property depends on the y position of the smiley face.
+        scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
+    }
+
+    Image {
+        id: smiley
+        property int maxHeight: window.height / 3
+        property int minHeight: 2 * window.height / 3
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "images/face-smile.png"; y: minHeight
+
+        // Animate the y property. Setting repeat to true makes the
+        // animation repeat indefinitely, otherwise it would only run once.
+        y: SequentialAnimation {
+            running: true; repeat: true
+
+            // Move from minHeight to maxHeight in 300ms, using the easeOutExpo easing function
+            NumberAnimation {
+                from: smiley.minHeight; to: smiley.maxHeight
+                easing: "easeOutExpo"; duration: 300
+            }
+            
+            // Then move back to minHeight in 1 second, using the easeOutBounce easing function
+            NumberAnimation {
+                from: smiley.maxHeight; to: smiley.minHeight
+                easing: "easeOutBounce"; duration: 1000
+            }
+
+            // Then pause for 500ms
+            PauseAnimation { duration: 500 }
+        }
+    }
+}
diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml
deleted file mode 100644
index 23d7b29..0000000
--- a/examples/declarative/easing/easing.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: window
-    width: 640
-    height: layout.height
-    color: "white"
-
-    ListModel {
-        id: easingTypes
-        ListElement { type: "easeLinear" }
-        ListElement { type: "easeInQuad" }
-        ListElement { type: "easeOutQuad" }
-        ListElement { type: "easeInOutQuad" }
-        ListElement { type: "easeOutInQuad" }
-        ListElement { type: "easeInCubic" }
-        ListElement { type: "easeOutCubic" }
-        ListElement { type: "easeInOutCubic" }
-        ListElement { type: "easeOutInCubic" }
-        ListElement { type: "easeInQuart" }
-        ListElement { type: "easeOutQuart" }
-        ListElement { type: "easeInOutQuart" }
-        ListElement { type: "easeOutInQuart" }
-        ListElement { type: "easeInQuint" }
-        ListElement { type: "easeOutQuint" }
-        ListElement { type: "easeInOutQuint" }
-        ListElement { type: "easeOutInQuint" }
-        ListElement { type: "easeInSine" }
-        ListElement { type: "easeOutSine" }
-        ListElement { type: "easeInOutSine" }
-        ListElement { type: "easeOutInSine" }
-        ListElement { type: "easeInExpo" }
-        ListElement { type: "easeOutExpo" }
-        ListElement { type: "easeInOutExpo" }
-        ListElement { type: "easeOutInExpo" }
-        ListElement { type: "easeInCirc" }
-        ListElement { type: "easeOutCirc" }
-        ListElement { type: "easeInOutCirc" }
-        ListElement { type: "easeOutInCirc" }
-        ListElement { type: "easeInElastic" }
-        ListElement { type: "easeOutElastic" }
-        ListElement { type: "easeInOutElastic" }
-        ListElement { type: "easeOutInElastic" }
-        ListElement { type: "easeInBack" }
-        ListElement { type: "easeOutBack" }
-        ListElement { type: "easeInOutBack" }
-        ListElement { type: "easeOutInBack" }
-        ListElement { type: "easeOutBounce" }
-        ListElement { type: "easeInBounce" }
-        ListElement { type: "easeInOutBounce" }
-        ListElement { type: "easeOutInBounce" }
-    }
-
-    Column {
-        id: layout
-        anchors.left: window.left
-        anchors.right: window.right
-        Repeater {
-            model: easingTypes
-            Component {
-                Text {
-                    text: type
-                    height: 18
-                    font.italic: true
-                    x: SequentialAnimation {
-                        id: anim
-                        NumberAnimation {
-                            from: 0
-                            to: window.width / 2
-                            easing: type
-                            duration: 1000
-                        }
-                        PauseAnimation {
-                            duration: 300
-                        }
-                        NumberAnimation {
-                            to: 0
-                            from: window.width / 2
-                            easing: type
-                            duration: 1000
-                        }
-                    }
-                    children: [
-                        MouseRegion {
-                            onClicked: { anim.running=true }
-                            anchors.fill: parent
-                        }
-                    ]
-                }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro
index 806a362..9ee0933 100644
--- a/examples/declarative/loader/loader.pro
+++ b/examples/declarative/loader/loader.pro
@@ -1,4 +1,5 @@
-SOURCES = main.cpp
+SOURCES = main.cpp qmlfolderlistmodel.cpp
+HEADERS = qmlfolderlistmodel.h
 RESOURCES = loader.qrc
 
 QT += script declarative network
diff --git a/examples/declarative/loader/qmlfolderlistmodel.cpp b/examples/declarative/loader/qmlfolderlistmodel.cpp
new file mode 100644
index 0000000..0e5c275
--- /dev/null
+++ b/examples/declarative/loader/qmlfolderlistmodel.cpp
@@ -0,0 +1,413 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qobject_p.h"
+#include <QDirModel>
+#include <qdebug.h>
+#include "qmlfolderlistmodel.h"
+#include <QtDeclarative/qmlcontext.h>
+
+QT_BEGIN_NAMESPACE
+
+class QmlFolderListModelPrivate : public QObjectPrivate
+{
+public:
+    QmlFolderListModelPrivate()
+        : sortField(QmlFolderListModel::Name), sortReversed(false), count(0) {
+        nameFilters << QLatin1String("*");
+    }
+
+    void updateSorting() {
+        QDir::SortFlags flags = 0;
+        switch(sortField) {
+        case QmlFolderListModel::Unsorted:
+            flags |= QDir::Unsorted;
+            break;
+        case QmlFolderListModel::Name:
+            flags |= QDir::Name;
+            break;
+        case QmlFolderListModel::Time:
+            flags |= QDir::Time;
+            break;
+        case QmlFolderListModel::Size:
+            flags |= QDir::Size;
+            break;
+        case QmlFolderListModel::Type:
+            flags |= QDir::Type;
+            break;
+        }
+
+        if (sortReversed)
+            flags |= QDir::Reversed;
+
+        model.setSorting(flags);
+    }
+
+    QDirModel model;
+    QUrl folder;
+    QStringList nameFilters;
+    QModelIndex folderIndex;
+    QmlFolderListModel::SortField sortField;
+    bool sortReversed;
+    int count;
+};
+
+/*!
+    \qmlclass FolderListModel
+    \brief The FolderListModel provides a model of the contents of a folder in a filesystem.
+
+    FolderListModel provides access to the local filesystem.  The \e folder property
+    specifies the folder to list.
+
+    Qt uses "/" as a universal directory separator in the same way that "/" is
+    used as a path separator in URLs. If you always use "/" as a directory
+    separator, Qt will translate your paths to conform to the underlying
+    operating system.
+
+    The roles available are:
+    \list
+    \o fileName
+    \o filePath
+    \endlist
+
+    Additionally a file entry can be differentiated from a folder entry
+    via the \l isFolder() method.
+*/
+
+QmlFolderListModel::QmlFolderListModel(QObject *parent)
+    : QListModelInterface(*(new QmlFolderListModelPrivate), parent)
+{
+    Q_D(QmlFolderListModel);
+    d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
+    connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
+            , this, SLOT(inserted(const QModelIndex&,int,int)));
+    connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int))
+            , this, SLOT(removed(const QModelIndex&,int,int)));
+    connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&))
+            , this, SLOT(dataChanged(const QModelIndex&,const QModelIndex&)));
+    connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh()));
+    connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
+}
+
+QmlFolderListModel::~QmlFolderListModel()
+{
+}
+
+QHash<int,QVariant> QmlFolderListModel::data(int index, const QList<int> &roles) const
+{
+    Q_UNUSED(roles);
+    Q_D(const QmlFolderListModel);
+    QHash<int,QVariant> folderData;
+    QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex);
+    if (modelIndex.isValid()) {
+        folderData[QDirModel::FileNameRole] = d->model.data(modelIndex, QDirModel::FileNameRole);
+        folderData[QDirModel::FilePathRole] = QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString());
+    }
+
+    return folderData;
+}
+
+int QmlFolderListModel::count() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->count;
+}
+
+QList<int> QmlFolderListModel::roles() const
+{
+    QList<int> r;
+    r << QDirModel::FileNameRole;
+    r << QDirModel::FilePathRole;
+    return r;
+}
+
+QString QmlFolderListModel::toString(int role) const
+{
+    switch (role) {
+    case QDirModel::FileNameRole:
+        return QLatin1String("fileName");
+    case QDirModel::FilePathRole:
+        return QLatin1String("filePath");
+    }
+
+    return QString();
+}
+
+/*!
+    \qmlproperty string FolderListModel::folder
+
+    The \a folder property holds the folder the model is currently providing.
+
+    It is a URL, but must be a file: or qrc: URL (or relative to such a URL).
+*/
+QUrl QmlFolderListModel::folder() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->folder;
+}
+
+void QmlFolderListModel::setFolder(const QUrl &folder)
+{
+    Q_D(QmlFolderListModel);
+    if (folder == d->folder)
+        return;
+    QModelIndex index = d->model.index(folder.toLocalFile());
+    if (index.isValid() && d->model.isDir(index)) {
+        d->folder = folder;
+        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
+        emit folderChanged();
+    }
+}
+
+QUrl QmlFolderListModel::parentFolder() const
+{
+    Q_D(const QmlFolderListModel);
+    int pos = d->folder.path().lastIndexOf(QLatin1Char('/'));
+    if (pos == -1)
+        return QUrl();
+    QUrl r = d->folder;
+    r.setPath(d->folder.path().left(pos));
+    return r;
+}
+
+/*!
+    \qmlproperty list<string> FolderListModel::nameFilters
+
+    The \a nameFilters property contains a list of filename filters.
+    The filters may include the ? and * wildcards.
+
+    The example below filters on PNG and JPEG files:
+
+    \code
+    FolderListModel {
+        nameFilters: [ "*.png", "*.jpg" ]
+    }
+    \endcode
+*/
+QStringList QmlFolderListModel::nameFilters() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->nameFilters;
+}
+
+void QmlFolderListModel::setNameFilters(const QStringList &filters)
+{
+    Q_D(QmlFolderListModel);
+    d->nameFilters = filters;
+    d->model.setNameFilters(d->nameFilters);
+}
+
+void QmlFolderListModel::componentComplete()
+{
+    Q_D(QmlFolderListModel);
+    if (!d->folder.isValid() || !QDir().exists(d->folder.toLocalFile()))
+        setFolder(QUrl(QLatin1String("file://")+QDir::currentPath()));
+
+    if (!d->folderIndex.isValid())
+        QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
+}
+
+QmlFolderListModel::SortField QmlFolderListModel::sortField() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->sortField;
+}
+
+void QmlFolderListModel::setSortField(SortField field)
+{
+    Q_D(QmlFolderListModel);
+    if (field != d->sortField) {
+        d->sortField = field;
+        d->updateSorting();
+    }
+}
+
+bool QmlFolderListModel::sortReversed() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->sortReversed;
+}
+
+void QmlFolderListModel::setSortReversed(bool rev)
+{
+    Q_D(QmlFolderListModel);
+    if (rev != d->sortReversed) {
+        d->sortReversed = rev;
+        d->updateSorting();
+    }
+}
+
+/*!
+    \qmlmethod bool FolderListModel::isFolder(int index)
+
+    Returns true if the entry \a index is a folder; otherwise
+    returns false.
+*/
+bool QmlFolderListModel::isFolder(int index) const
+{
+    Q_D(const QmlFolderListModel);
+    if (index != -1) {
+        QModelIndex idx = d->model.index(index, 0, d->folderIndex);
+        if (idx.isValid())
+            return d->model.isDir(idx);
+    }
+    return false;
+}
+
+void QmlFolderListModel::refresh()
+{
+    Q_D(QmlFolderListModel);
+    d->folderIndex = QModelIndex();
+    if (d->count) {
+        int tmpCount = d->count;
+        d->count = 0;
+        emit itemsRemoved(0, tmpCount);
+    }
+    d->folderIndex = d->model.index(d->folder.toLocalFile());
+    d->count = d->model.rowCount(d->folderIndex);
+    if (d->count) {
+        emit itemsInserted(0, d->count);
+    }
+}
+
+void QmlFolderListModel::inserted(const QModelIndex &index, int start, int end)
+{
+    Q_D(QmlFolderListModel);
+    if (index == d->folderIndex) {
+        d->count = d->model.rowCount(d->folderIndex);
+        emit itemsInserted(start, end - start + 1);
+    }
+}
+
+void QmlFolderListModel::removed(const QModelIndex &index, int start, int end)
+{
+    Q_D(QmlFolderListModel);
+    if (index == d->folderIndex) {
+        d->count = d->model.rowCount(d->folderIndex);
+        emit itemsRemoved(start, end - start + 1);
+    }
+}
+
+void QmlFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex &end)
+{
+    Q_D(QmlFolderListModel);
+    qDebug() << "data changed";
+    if (start.parent() == d->folderIndex)
+        emit itemsChanged(start.row(), end.row() - start.row() + 1, roles());
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showDirs
+
+    If true (the default), directories are included in the model.
+
+    Note that the nameFilters are ignored for directories.
+*/
+bool QmlFolderListModel::showDirs() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->model.filter() & QDir::AllDirs;
+}
+
+void  QmlFolderListModel::setShowDirs(bool on)
+{
+    Q_D(QmlFolderListModel);
+    if (!(d->model.filter() & QDir::AllDirs) == !on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() | QDir::AllDirs | QDir::Drives);
+    else
+        d->model.setFilter(d->model.filter() & ~(QDir::AllDirs | QDir::Drives));
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showDotAndDotDot
+
+    If true, the "." and ".." directories are included in the model.
+
+    The default is false.
+*/
+bool QmlFolderListModel::showDotAndDotDot() const
+{
+    Q_D(const QmlFolderListModel);
+    return !(d->model.filter() & QDir::NoDotAndDotDot);
+}
+
+void  QmlFolderListModel::setShowDotAndDotDot(bool on)
+{
+    Q_D(QmlFolderListModel);
+    if (!(d->model.filter() & QDir::NoDotAndDotDot) == on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() & ~QDir::NoDotAndDotDot);
+    else
+        d->model.setFilter(d->model.filter() | QDir::NoDotAndDotDot);
+}
+
+/*!
+    \qmlproperty bool FolderListModel::showOnlyReadable
+
+    If true, only readable files and directories are shown.
+
+    The default is false.
+*/
+bool QmlFolderListModel::showOnlyReadable() const
+{
+    Q_D(const QmlFolderListModel);
+    return d->model.filter() & QDir::Readable;
+}
+
+void  QmlFolderListModel::setShowOnlyReadable(bool on)
+{
+    Q_D(QmlFolderListModel);
+    if (!(d->model.filter() & QDir::Readable) == !on)
+        return;
+    if (on)
+        d->model.setFilter(d->model.filter() | QDir::Readable);
+    else
+        d->model.setFilter(d->model.filter() & ~QDir::Readable);
+}
+
+
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FolderListModel,QmlFolderListModel)
+
+QT_END_NAMESPACE
+
diff --git a/examples/declarative/loader/qmlfolderlistmodel.h b/examples/declarative/loader/qmlfolderlistmodel.h
new file mode 100644
index 0000000..66e600b
--- /dev/null
+++ b/examples/declarative/loader/qmlfolderlistmodel.h
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLFOLDERLISTMODEL_H
+#define QMLFOLDERLISTMODEL_H
+
+#include <QtDeclarative/qml.h>
+#include <QtDeclarative/QListModelInterface>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QmlContext;
+class QModelIndex;
+
+class QmlFolderListModelPrivate;
+class Q_DECLARATIVE_EXPORT QmlFolderListModel : public QListModelInterface, public QmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QmlParserStatus)
+
+    Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged)
+    Q_PROPERTY(QUrl parentFolder READ parentFolder NOTIFY folderChanged)
+    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
+    Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
+    Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
+    Q_PROPERTY(bool showDirs READ showDirs WRITE setShowDirs)
+    Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
+    Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
+
+public:
+    QmlFolderListModel(QObject *parent = 0);
+    ~QmlFolderListModel();
+
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
+    virtual int count() const;
+    virtual QList<int> roles() const;
+    virtual QString toString(int role) const;
+
+    QUrl folder() const;
+    void setFolder(const QUrl &folder);
+
+    QUrl parentFolder() const;
+
+    QStringList nameFilters() const;
+    void setNameFilters(const QStringList &filters);
+
+    virtual void componentComplete();
+
+    Q_INVOKABLE bool isFolder(int index) const;
+
+    enum SortField { Unsorted, Name, Time, Size, Type };
+    SortField sortField() const;
+    void setSortField(SortField field);
+    Q_ENUMS(SortField)
+
+    bool sortReversed() const;
+    void setSortReversed(bool rev);
+
+    bool showDirs() const;
+    void  setShowDirs(bool);
+    bool showDotAndDotDot() const;
+    void  setShowDotAndDotDot(bool);
+    bool showOnlyReadable() const;
+    void  setShowOnlyReadable(bool);
+
+Q_SIGNALS:
+    void folderChanged();
+
+private Q_SLOTS:
+    void refresh();
+    void inserted(const QModelIndex &index, int start, int end);
+    void removed(const QModelIndex &index, int start, int end);
+    void dataChanged(const QModelIndex &start, const QModelIndex &end);
+
+private:
+    Q_DECLARE_PRIVATE(QmlFolderListModel)
+    Q_DISABLE_COPY(QmlFolderListModel)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QmlFolderListModel)
+
+QT_END_HEADER
+
+#endif // QMLFOLDERLISTMODEL_H
diff --git a/examples/declarative/sql/README b/examples/declarative/sql/README
deleted file mode 100644
index a7baab2..0000000
--- a/examples/declarative/sql/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Simple demonstration of HTML5-compatible SQL database interface.
-Adds another "hello, world" every time you run it.
-Database is stored in:
- - %APPDATA%/Nokia/Qt/QML/Databases/ (Windows)
- - ~/.local/share/Nokia/Qt/QML/Databases/ (Unix)
- - ~/Library/Application Support/Nokia/Qt/QML/Databases/ (Mac OS X)
-No quota management.
diff --git a/examples/declarative/sql/hello.qml b/examples/declarative/sql/hello.qml
index 20ea611..dc3ca35 100644
--- a/examples/declarative/sql/hello.qml
+++ b/examples/declarative/sql/hello.qml
@@ -3,12 +3,17 @@ import Qt 4.6
 Text {
     Script {
         function findGreetings() {
-            var db = openDatabase("QmlExampleDB", "", "The Example QML SQL!", 1000000);
+            var db = openDatabase("QmlExampleDB", "1.0", "The Example QML SQL!", 1000000);
 
             db.transaction(
                 function(tx) {
+                    // Create the database if it doesn't already exist
                     tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)', []);
+
+                    // Add (another) greeting row
                     tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+
+                    // Show all added greetings
                     tx.executeSql('SELECT * FROM Greeting', [],
                         function(tx, rs) {
                             var r = ""