Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

20 files changed, 504 insertions, 205 deletions

diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp
new file mode 100644
index 0000000..e0f6df2
--- /dev/null
+++ b/src/declarative/util/qdeclarativeapplication.cpp
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (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 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 "qdeclarativeapplication_p.h"
+#include <private/qobject_p.h>
+#include <QtGui/QApplication>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeApplicationPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeApplication)
+public:
+    QDeclarativeApplicationPrivate() : active(QApplication::activeWindow() != 0),
+    layoutDirection(QApplication::layoutDirection()) {}
+    bool active;
+    Qt::LayoutDirection layoutDirection;
+};
+
+/*
+    This object and its properties are documented as part of the Qt object,
+    in qdeclarativengine.cpp
+*/
+
+QDeclarativeApplication::QDeclarativeApplication(QObject *parent) : QObject(*new QDeclarativeApplicationPrivate(), parent)
+{
+    if (qApp)
+        qApp->installEventFilter(this);
+}
+
+QDeclarativeApplication::~QDeclarativeApplication()
+{
+}
+
+bool QDeclarativeApplication::active() const
+{
+    Q_D(const QDeclarativeApplication);
+    return d->active;
+}
+
+Qt::LayoutDirection QDeclarativeApplication::layoutDirection() const
+{
+    Q_D(const QDeclarativeApplication);
+    return d->layoutDirection;
+}
+
+bool QDeclarativeApplication::eventFilter(QObject *obj, QEvent *event)
+{
+    Q_UNUSED(obj)
+    Q_D(QDeclarativeApplication);
+    if (event->type() == QEvent::ApplicationActivate
+     || event->type() == QEvent::ApplicationDeactivate) {
+        bool active = d->active;
+        if (event->type() == QEvent::ApplicationActivate)
+            active  = true;
+        else if (event->type() == QEvent::ApplicationDeactivate)
+            active  = false;
+
+        if (d->active != active) {
+            d->active = active;
+            emit activeChanged();
+        }
+    }
+    if (event->type() == QEvent::LayoutDirectionChange) {
+        Qt::LayoutDirection direction = QApplication::layoutDirection();
+        if (d->layoutDirection != direction) {
+            d->layoutDirection = direction;
+            emit layoutDirectionChanged();
+        }
+    }
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h
new file mode 100644
index 0000000..caaed18
--- /dev/null
+++ b/src/declarative/util/qdeclarativeapplication_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (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 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$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEAPPLICATION_P_H
+#define QDECLARATIVEAPPLICATION_P_H
+
+#include <QtCore/QObject>
+#include <qdeclarative.h>
+#include <private/qdeclarativeglobal_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeApplicationPrivate;
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
+
+public:
+    explicit QDeclarativeApplication(QObject *parent = 0);
+    virtual ~QDeclarativeApplication();
+    bool active() const;
+    Qt::LayoutDirection layoutDirection() const;
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event);
+
+Q_SIGNALS:
+    void activeChanged();
+    void layoutDirectionChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeApplication)
+    Q_DECLARE_PRIVATE(QDeclarativeApplication)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeApplication)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEAPPLICATION_P_H
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index e986ac9..5a66aab 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -45,6 +45,7 @@
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeboundsignal_p.h>
 #include <qdeclarativecontext.h>
+#include <qdeclarativecontext_p.h>
 #include <qdeclarativeinfo.h>
 
 #include <QtCore/qdebug.h>
@@ -257,7 +258,11 @@ void QDeclarativeConnections::connectSignals()
         if (prop.isValid() && (prop.type() & QDeclarativeProperty::SignalProperty)) {
             QDeclarativeBoundSignal *signal =
                 new QDeclarativeBoundSignal(target(), prop.method(), this);
-            signal->setExpression(new QDeclarativeExpression(qmlContext(this), 0, script));
+            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(this), 0, script);
+            QDeclarativeData *ddata = QDeclarativeData::get(this);
+            if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
+                expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
+            signal->setExpression(expression);
             d->boundsignals += signal;
         } else {
             if (!d->ignoreUnknownSignals)
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 69172b9..9332de4 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -559,6 +559,14 @@ QScriptValue QDeclarativeListModel::get(int index) const
 */
 void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
 {
+    QList<int> roles;
+    set(index, valuemap, &roles);
+    if (!roles.isEmpty() && !inWorkerThread())
+        emit itemsChanged(index, 1, roles);
+}
+
+void QDeclarativeListModel::set(int index, const QScriptValue& valuemap, QList<int> *roles)
+{
     if (!valuemap.isObject() || valuemap.isArray()) {
         qmlInfo(this) << tr("set: value is not an object");
         return;
@@ -571,14 +579,10 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
     if (index == count()) {
         append(valuemap);
     } else {
-        QList<int> roles;
         if (m_flat)
-            m_flat->set(index, valuemap, &roles);
+            m_flat->set(index, valuemap, roles);
         else
-            m_nested->set(index, valuemap, &roles);
-
-        if (!inWorkerThread())
-            emit itemsChanged(index, 1, roles);
+            m_nested->set(index, valuemap, roles);
     }
 }
 
@@ -597,19 +601,23 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
 */
 void QDeclarativeListModel::setProperty(int index, const QString& property, const QVariant& value)
 {
+    QList<int> roles;
+    setProperty(index, property, value, &roles);
+    if (!roles.isEmpty() && !inWorkerThread())
+        emit itemsChanged(index, 1, roles);
+}
+
+void QDeclarativeListModel::setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles)
+{
     if (count() == 0 || index >= count() || index < 0) {
         qmlInfo(this) << tr("set: index %1 out of range").arg(index);
         return;
     }
 
-    QList<int> roles;
     if (m_flat)
-        m_flat->setProperty(index, property, value, &roles);
+        m_flat->setProperty(index, property, value, roles);
     else
-        m_nested->setProperty(index, property, value, &roles);
-
-    if (!inWorkerThread())
-        emit itemsChanged(index, 1, roles);
+        m_nested->setProperty(index, property, value, roles);
 }
 
 /*!
@@ -1011,9 +1019,11 @@ void FlatListModel::setProperty(int index, const QString& property, const QVaria
     } else {
         role = iter.value();
     }
-    roles->append(role);
 
-    m_values[index][role] = value;
+    if (m_values[index][role] != value) {
+        roles->append(role);
+        m_values[index][role] = value;
+    }
 }
 
 void FlatListModel::move(int from, int to, int n)
@@ -1043,6 +1053,10 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro
             iter = m_strings.insert(name, role);
             if (roles)
                 roles->append(role);
+        } else {
+            int role = iter.value();
+            if (roles && row->contains(role) && row->value(role) != v)
+                roles->append(role);
         }
         row->insert(*iter, v);
     }
@@ -1151,14 +1165,14 @@ void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const
         QHash<int, QVariant> &row = m_model->m_values[index];
         row[role] = value.toVariant();
 
+        QList<int> roles;
+        roles << role;
         if (m_model->m_parentAgent) {
             // This is the list in the worker thread, so tell the agent to
             // emit itemsChanged() later
-            m_model->m_parentAgent->changedData(index, 1);
+            m_model->m_parentAgent->changedData(index, 1, roles);
         } else {
             // This is the list in the main thread, so emit itemsChanged()
-            QList<int> roles;
-            roles << role;
             emit m_model->m_listModel->itemsChanged(index, 1, roles);
         }
     }
@@ -1350,7 +1364,9 @@ void NestedListModel::set(int index, const QScriptValue& valuemap, QList<int> *r
     Q_ASSERT(index >=0 && index < count());
 
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    node->setObjectValue(valuemap);
+    bool emitItemsChanged = node->setObjectValue(valuemap);
+    if (!emitItemsChanged)
+        return;
 
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
@@ -1369,7 +1385,9 @@ void NestedListModel::setProperty(int index, const QString& property, const QVar
     Q_ASSERT(index >=0 && index < count());
 
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    node->setProperty(property, value);
+    bool emitItemsChanged = node->setProperty(property, value);
+    if (!emitItemsChanged)
+        return;
 
     int r = roleStrings.indexOf(property);
     if (r < 0) {
@@ -1441,24 +1459,37 @@ void ModelNode::clear()
     properties.clear();
 }
 
-void ModelNode::setObjectValue(const QScriptValue& valuemap, bool writeToCache) {
+bool ModelNode::setObjectValue(const QScriptValue& valuemap, bool writeToCache)
+{
+    bool emitItemsChanged = false;
+
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
         it.next();
+        ModelNode *prev = properties.value(it.name());
         ModelNode *value = new ModelNode(m_model);
         QScriptValue v = it.value();
+
         if (v.isArray()) {
             value->isArray = true;
             value->setListValue(v);
+            if (writeToCache && objectCache)
+                objectCache->setValue(it.name().toUtf8(), QVariant::fromValue(value->model(m_model)));
+            emitItemsChanged = true;    // for now, too inefficient to check whether list and sublists have changed
         } else {
             value->values << v.toVariant();
             if (writeToCache && objectCache)
                 objectCache->setValue(it.name().toUtf8(), value->values.last());
+            if (!emitItemsChanged && prev && prev->values.count() == 1
+                    && prev->values[0] != value->values.last()) {
+                emitItemsChanged = true;
+            }
         }
         if (properties.contains(it.name()))
             delete properties[it.name()];
         properties.insert(it.name(), value);
     }
+    return emitItemsChanged;
 }
 
 void ModelNode::setListValue(const QScriptValue& valuelist) {
@@ -1481,9 +1512,12 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
     }
 }
 
-void ModelNode::setProperty(const QString& prop, const QVariant& val) {
+bool ModelNode::setProperty(const QString& prop, const QVariant& val) {
     QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
+    bool emitItemsChanged = false;
     if (it != properties.end()) {
+        if (val != (*it)->values[0])
+            emitItemsChanged = true;
         (*it)->values[0] = val;
     } else {
         ModelNode *n = new ModelNode(m_model);
@@ -1492,6 +1526,7 @@ void ModelNode::setProperty(const QString& prop, const QVariant& val) {
     }
     if (objectCache)
         objectCache->setValue(prop.toUtf8(), val);
+    return emitItemsChanged;
 }
 
 void ModelNode::updateListIndexes()
@@ -1559,7 +1594,7 @@ ModelObject::ModelObject(ModelNode *node, NestedListModel *model, QScriptEngine
 void ModelObject::setValue(const QByteArray &name, const QVariant &val)
 {
     m_meta->setValue(name, val);
-    setProperty(name.constData(), val);
+    //setProperty(name.constData(), val);
 }
 
 void ModelObject::setNodeUpdatesEnabled(bool enable)
@@ -1586,9 +1621,9 @@ void ModelNodeMetaObject::propertyWritten(int index)
 
     QScriptValue sv = m_seng->newObject();
     sv.setProperty(propName, m_seng->newVariant(value));
-    m_obj->m_node->setObjectValue(sv, false);
-
-    m_obj->m_node->changedProperty(propName);
+    bool changed = m_obj->m_node->setObjectValue(sv, false);
+    if (changed)
+        m_obj->m_node->changedProperty(propName);
 }
 
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index 5f73557..7870b4f 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -103,6 +103,9 @@ private:
     // Constructs a flat list model for a worker agent
     QDeclarativeListModel(const QDeclarativeListModel *orig, QDeclarativeListModelWorkerAgent *parent);
 
+    void set(int index, const QScriptValue&, QList<int> *roles);
+    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles);
+
     bool flatten();
     bool inWorkerThread() const;
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index 5ba702c..7236e8b 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -190,7 +190,7 @@ public:
     bool insert(int index, const QScriptValue&);
     QScriptValue get(int index) const;
     void set(int index, const QScriptValue&, QList<int> *roles);
-    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *role);
+    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles);
     void move(int from, int to, int count);
 
     QVariant valueForNode(ModelNode *, bool *hasNested = 0) const;
@@ -255,9 +255,9 @@ struct ModelNode
     QDeclarativeListModel *model(const NestedListModel *model);
     ModelObject *object(const NestedListModel *model);
 
-    void setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
+    bool setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
     void setListValue(const QScriptValue& valuelist);
-    void setProperty(const QString& prop, const QVariant& val);
+    bool setProperty(const QString& prop, const QVariant& val);
     void changedProperty(const QString &name) const;
     void updateListIndexes();
     static void dump(ModelNode *node, int ind);
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index 69353f1..befa8eb 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -60,25 +60,25 @@ void QDeclarativeListModelWorkerAgent::Data::clearChange()
 
 void QDeclarativeListModelWorkerAgent::Data::insertChange(int index, int count) 
 {
-    Change c = { Change::Inserted, index, count, 0 };
+    Change c = { Change::Inserted, index, count, 0, QList<int>() };
     changes << c;
 }
 
 void QDeclarativeListModelWorkerAgent::Data::removeChange(int index, int count) 
 {
-    Change c = { Change::Removed, index, count, 0 };
+    Change c = { Change::Removed, index, count, 0, QList<int>() };
     changes << c;
 }
 
 void QDeclarativeListModelWorkerAgent::Data::moveChange(int index, int count, int to)
 {
-    Change c = { Change::Moved, index, count, to };
+    Change c = { Change::Moved, index, count, to, QList<int>() };
     changes << c;
 }
 
-void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count)
+void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count, const QList<int> &roles)
 {
-    Change c = { Change::Changed, index, count, 0 };
+    Change c = { Change::Changed, index, count, 0, roles };
     changes << c;
 }
 
@@ -165,14 +165,18 @@ QScriptValue QDeclarativeListModelWorkerAgent::get(int index) const
 
 void QDeclarativeListModelWorkerAgent::set(int index, const QScriptValue &value)
 {
-    m_copy->set(index, value);
-    data.changedChange(index, 1);
+    QList<int> roles;
+    m_copy->set(index, value, &roles);
+    if (!roles.isEmpty())
+        data.changedChange(index, 1, roles);
 }
 
 void QDeclarativeListModelWorkerAgent::setProperty(int index, const QString& property, const QVariant& value)
 {
-    m_copy->setProperty(index, property, value);
-    data.changedChange(index, 1);
+    QList<int> roles;
+    m_copy->setProperty(index, property, value, &roles);
+    if (!roles.isEmpty())
+        data.changedChange(index, 1, roles);
 }
 
 void QDeclarativeListModelWorkerAgent::move(int from, int to, int count)
@@ -194,9 +198,9 @@ void QDeclarativeListModelWorkerAgent::sync()
     mutex.unlock();
 }
 
-void QDeclarativeListModelWorkerAgent::changedData(int index, int count)
+void QDeclarativeListModelWorkerAgent::changedData(int index, int count, const QList<int> &roles)
 {
-    data.changedChange(index, count);
+    data.changedChange(index, count, roles);
 }
 
 bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
@@ -255,7 +259,7 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
                     emit m_orig->itemsMoved(change.index, change.to, change.count);
                     break;
                 case Change::Changed:
-                    emit m_orig->itemsChanged(change.index, change.count, orig->m_roles.keys());
+                    emit m_orig->itemsChanged(change.index, change.count, change.roles);
                     break;
                 }
             }
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index fbe0195..4c800e9 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -124,6 +124,7 @@ private:
         int index; // Inserted/Removed/Moved/Changed
         int count; // Inserted/Removed/Moved/Changed
         int to;    // Moved
+        QList<int> roles;
     };
 
     struct Data {
@@ -133,7 +134,7 @@ private:
         void insertChange(int index, int count);
         void removeChange(int index, int count);
         void moveChange(int index, int count, int to);
-        void changedChange(int index, int count);
+        void changedChange(int index, int count, const QList<int> &roles);
     };
     Data data;
 
@@ -143,7 +144,7 @@ private:
         QDeclarativeListModel *list;
     };
 
-    void changedData(int index, int count);
+    void changedData(int index, int count, const QList<int> &roles);
 
     QAtomicInt m_ref;
     QDeclarativeListModel *m_orig;
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index 510a0c1..0ceda35 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -97,7 +97,6 @@ int QDeclarativeOpenMetaObjectType::createProperty(const QByteArray &name)
     int id = d->mob.propertyCount();
     d->mob.addSignal("__" + QByteArray::number(id) + "()");
     QMetaPropertyBuilder build = d->mob.addProperty(name, "QVariant", id);
-    build.setDynamic(true);
     propertyCreated(id, build);
     qFree(d->mem);
     d->mem = d->mob.toMetaObject();
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 1dd01f6..5190eab 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -959,20 +959,20 @@ QRect QDeclarativePixmap::rect() const
 
 void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url)
 {
-    load(engine, url, QSize(), false);
+    load(engine, url, QSize(), QDeclarativePixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, bool async)
+void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, QDeclarativePixmap::Options options)
 {
-    load(engine, url, QSize(), async);
+    load(engine, url, QSize(), options);
 }
 
 void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &size)
 {
-    load(engine, url, size, false);
+    load(engine, url, size, QDeclarativePixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, bool async)
+void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, QDeclarativePixmap::Options options)
 {
     if (d) { d->release(); d = 0; }
 
@@ -982,19 +982,20 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
     QHash<QDeclarativePixmapKey, QDeclarativePixmapData *>::Iterator iter = store->m_cache.find(key);
 
     if (iter == store->m_cache.end()) {
-        if (async) {
+        if (options & QDeclarativePixmap::Asynchronous) {
             // pixmaps can only be loaded synchronously
             if (url.scheme() == QLatin1String("image") 
                     && QDeclarativeEnginePrivate::get(engine)->getImageProviderType(url) == QDeclarativeImageProvider::Pixmap) {
-                async = false;
+                options &= ~QDeclarativePixmap::Asynchronous;
             }
         }
 
-        if (!async) {
+        if (!(options & QDeclarativePixmap::Asynchronous)) {
             bool ok = false;
             d = createPixmapDataSync(engine, url, requestSize, &ok);
             if (ok) {
-                d->addToCache();
+                if (options & QDeclarativePixmap::Cache)
+                    d->addToCache();
                 return;
             }
             if (d)  // loadable, but encountered error while loading
@@ -1007,7 +1008,8 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
         QDeclarativePixmapReader *reader = QDeclarativePixmapReader::instance(engine);
 
         d = new QDeclarativePixmapData(url, requestSize);
-        d->addToCache();
+        if (options & QDeclarativePixmap::Cache)
+            d->addToCache();
 
         d->reply = reader->getImage(d);
     } else {
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
index f9ebf3b..1cf76dd 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -66,6 +66,12 @@ public:
 
     enum Status { Null, Ready, Error, Loading };
 
+    enum Option {
+        Asynchronous = 0x00000001,
+        Cache        = 0x00000002
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+
     bool isNull() const;
     bool isReady() const;
     bool isError() const;
@@ -85,9 +91,9 @@ public:
     inline operator const QPixmap &() const;
 
     void load(QDeclarativeEngine *, const QUrl &);
-    void load(QDeclarativeEngine *, const QUrl &, bool);
+    void load(QDeclarativeEngine *, const QUrl &, QDeclarativePixmap::Options options);
     void load(QDeclarativeEngine *, const QUrl &, const QSize &);
-    void load(QDeclarativeEngine *, const QUrl &, const QSize &, bool);
+    void load(QDeclarativeEngine *, const QUrl &, const QSize &, QDeclarativePixmap::Options options);
 
     void clear();
     void clear(QObject *);
@@ -107,6 +113,8 @@ inline QDeclarativePixmap::operator const QPixmap &() const
     return pixmap();
 }
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePixmap::Options)
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 1c5d463..ccd122e 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -42,6 +42,9 @@
 #include "private/qdeclarativepropertychanges_p.h"
 
 #include "private/qdeclarativeopenmetaobject_p.h"
+#include "private/qdeclarativerewrite_p.h"
+#include "private/qdeclarativeengine_p.h"
+#include "private/qdeclarativecompiler_p.h"
 
 #include <qdeclarativeinfo.h>
 #include <qdeclarativecustomparser_p.h>
@@ -217,11 +220,22 @@ public:
 
     void decode();
 
-    QList<QPair<QByteArray, QVariant> > properties;
-    QList<QPair<QByteArray, QDeclarativeExpression *> > expressions;
+    class ExpressionChange {
+    public:
+        ExpressionChange(const QString &_name,
+                         QDeclarativeBinding::Identifier _id,
+                         QDeclarativeExpression *_expr)
+            : name(_name), id(_id), expression(_expr) {}
+        QString name;
+        QDeclarativeBinding::Identifier id;
+        QDeclarativeExpression *expression;
+    };
+
+    QList<QPair<QString, QVariant> > properties;
+    QList<ExpressionChange> expressions;
     QList<QDeclarativeReplaceSignalHandler*> signalReplacements;
 
-    QDeclarativeProperty property(const QByteArray &);
+    QDeclarativeProperty property(const QString &);
 };
 
 void
@@ -267,6 +281,7 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
         QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second);
         QVariant var;
         bool isScript = v.isScript();
+        QDeclarativeBinding::Identifier id;
         switch(v.type()) {
         case QDeclarativeParser::Variant::Boolean:
             var = QVariant(v.asBoolean());
@@ -280,10 +295,17 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
         case QDeclarativeParser::Variant::Invalid:
         case QDeclarativeParser::Variant::Script:
             var = QVariant(v.asScript());
+            {
+                // Pre-rewrite the expression
+                QString expression = v.asScript();
+                id = rewriteBinding(expression, data.at(ii).first); //### recreates the AST, which is slow
+            }
             break;
         }
 
-        ds << data.at(ii).first << isScript << var;
+        ds << QString::fromUtf8(data.at(ii).first) << isScript << var;
+        if (isScript)
+            ds << id;
     }
 
     return rv;
@@ -300,12 +322,15 @@ void QDeclarativePropertyChangesPrivate::decode()
     int count;
     ds >> count;
     for (int ii = 0; ii < count; ++ii) {
-        QByteArray name;
+        QString name;
         bool isScript;
         QVariant data;
+        QDeclarativeBinding::Identifier id = QDeclarativeBinding::Invalid;
         ds >> name;
         ds >> isScript;
         ds >> data;
+        if (isScript)
+            ds >> id;
 
         QDeclarativeProperty prop = property(name);      //### better way to check for signal property?
         if (prop.type() & QDeclarativeProperty::SignalProperty) {
@@ -322,7 +347,7 @@ void QDeclarativePropertyChangesPrivate::decode()
             QDeclarativeData *ddata = QDeclarativeData::get(q);
             if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
                 expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
-            expressions << qMakePair(name, expression);
+            expressions << ExpressionChange(name, id, expression);
         } else {
             properties << qMakePair(name, data);
         }
@@ -350,7 +375,7 @@ QDeclarativePropertyChanges::~QDeclarativePropertyChanges()
 {
     Q_D(QDeclarativePropertyChanges);
     for(int ii = 0; ii < d->expressions.count(); ++ii)
-        delete d->expressions.at(ii).second;
+        delete d->expressions.at(ii).expression;
     for(int ii = 0; ii < d->signalReplacements.count(); ++ii)
         delete d->signalReplacements.at(ii);
 }
@@ -389,15 +414,15 @@ void QDeclarativePropertyChanges::setRestoreEntryValues(bool v)
 }
 
 QDeclarativeProperty
-QDeclarativePropertyChangesPrivate::property(const QByteArray &property)
+QDeclarativePropertyChangesPrivate::property(const QString &property)
 {
     Q_Q(QDeclarativePropertyChanges);
-    QDeclarativeProperty prop(object, QString::fromUtf8(property), qmlContext(q));
+    QDeclarativeProperty prop(object, property, qmlContext(q));
     if (!prop.isValid()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
         return QDeclarativeProperty();
     } else if (!(prop.type() & QDeclarativeProperty::SignalProperty) && !prop.isWritable()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property));
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
         return QDeclarativeProperty();
     }
     return prop;
@@ -413,9 +438,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->properties.count(); ++ii) {
 
-        QByteArray property = d->properties.at(ii).first;
-
-        QDeclarativeAction a(d->object, QString::fromUtf8(property),
+        QDeclarativeAction a(d->object, d->properties.at(ii).first,
                  qmlContext(this), d->properties.at(ii).second);
 
         if (a.property.isValid()) {
@@ -437,7 +460,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->expressions.count(); ++ii) {
 
-        QByteArray property = d->expressions.at(ii).first;
+        const QString &property = d->expressions.at(ii).name;
         QDeclarativeProperty prop = d->property(property);
 
         if (prop.isValid()) {
@@ -446,16 +469,20 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
             a.property = prop;
             a.fromValue = a.property.read();
             a.specifiedObject = d->object;
-            a.specifiedProperty = QString::fromUtf8(property);
+            a.specifiedProperty = property;
 
             if (d->isExplicit) {
-                a.toValue = d->expressions.at(ii).second->evaluate();
+                a.toValue = d->expressions.at(ii).expression->evaluate();
             } else {
-                QDeclarativeExpression *e = d->expressions.at(ii).second;
-                QDeclarativeBinding *newBinding = 
-                    new QDeclarativeBinding(e->expression(), object(), qmlContext(this));
+                QDeclarativeExpression *e = d->expressions.at(ii).expression;
+
+                QDeclarativeBinding::Identifier id = d->expressions.at(ii).id;
+                QDeclarativeBinding *newBinding = id != QDeclarativeBinding::Invalid ? QDeclarativeBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0;
+                if (!newBinding) {
+                    newBinding = new QDeclarativeBinding(e->expression(), object(), qmlContext(this));
+                    newBinding->setSourceLocation(e->sourceFile(), e->lineNumber());
+                }
                 newBinding->setTarget(prop);
-                newBinding->setSourceLocation(e->sourceFile(), e->lineNumber());
                 a.toBinding = newBinding;
                 a.deletableToBinding = true;
             }
@@ -498,10 +525,10 @@ void QDeclarativePropertyChanges::setIsExplicit(bool e)
     d->isExplicit = e;
 }
 
-bool QDeclarativePropertyChanges::containsValue(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsValue(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -514,15 +541,15 @@ bool QDeclarativePropertyChanges::containsValue(const QByteArray &name) const
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsExpression(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsExpression(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             return true;
         }
     }
@@ -530,21 +557,21 @@ bool QDeclarativePropertyChanges::containsExpression(const QByteArray &name) con
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsProperty(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsProperty(const QString &name) const
 {
     return containsValue(name) || containsExpression(name);
 }
 
-void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVariant &value)
+void QDeclarativePropertyChanges::changeValue(const QString &name, const QVariant &value)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             expressionIterator.remove();
             if (state() && state()->isStateActive()) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
@@ -576,7 +603,7 @@ void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVar
     action.property = d->property(name);
     action.fromValue = action.property.read();
     action.specifiedObject = object();
-    action.specifiedProperty = QString::fromUtf8(name);
+    action.specifiedProperty = name;
     action.toValue = value;
 
     propertyIterator.insert(PropertyEntry(name, value));
@@ -589,11 +616,11 @@ void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVar
     }
 }
 
-void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const QString &expression)
+void QDeclarativePropertyChanges::changeExpression(const QString &name, const QString &expression)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     bool hadValue = false;
 
@@ -610,8 +637,8 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            entry.second->setExpression(expression);
+        if (entry.name == name) {
+            entry.expression->setExpression(expression);
             if (state() && state()->isStateActive()) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
                 if (oldBinding) {
@@ -628,7 +655,7 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     }
 
     QDeclarativeExpression *newExpression = new QDeclarativeExpression(qmlContext(this), d->object, expression);
-    expressionIterator.insert(ExpressionEntry(name, newExpression));
+    expressionIterator.insert(ExpressionEntry(name, QDeclarativeBinding::Invalid, newExpression));
 
     if (state() && state()->isStateActive()) {
         if (hadValue) {
@@ -647,7 +674,7 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
             action.property = d->property(name);
             action.fromValue = action.property.read();
             action.specifiedObject = object();
-            action.specifiedProperty = QString::fromUtf8(name);
+            action.specifiedProperty = name;
 
 
             if (d->isExplicit) {
@@ -670,11 +697,11 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     // what about the signal handler?
 }
 
-QVariant QDeclarativePropertyChanges::property(const QByteArray &name) const
+QVariant QDeclarativePropertyChanges::property(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -687,24 +714,24 @@ QVariant QDeclarativePropertyChanges::property(const QByteArray &name) const
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            return QVariant(entry.second->expression());
+        if (entry.name == name) {
+            return QVariant(entry.expression->expression());
         }
     }
 
     return QVariant();
 }
 
-void QDeclarativePropertyChanges::removeProperty(const QByteArray &name)
+void QDeclarativePropertyChanges::removeProperty(const QString &name)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             expressionIterator.remove();
             state()->removeEntryFromRevertList(object(), name);
             return;
@@ -722,10 +749,10 @@ void QDeclarativePropertyChanges::removeProperty(const QByteArray &name)
     }
 }
 
-QVariant QDeclarativePropertyChanges::value(const QByteArray &name) const
+QVariant QDeclarativePropertyChanges::value(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -738,16 +765,16 @@ QVariant QDeclarativePropertyChanges::value(const QByteArray &name) const
     return QVariant();
 }
 
-QString QDeclarativePropertyChanges::expression(const QByteArray &name) const
+QString QDeclarativePropertyChanges::expression(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            return entry.second->expression();
+        if (entry.name == name) {
+            return entry.expression->expression();
         }
     }
 
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index aa57657..09e3a16 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -75,19 +75,19 @@ public:
 
     virtual ActionList actions();
 
-    bool containsProperty(const QByteArray &name) const;
-    bool containsValue(const QByteArray &name) const;
-    bool containsExpression(const QByteArray &name) const;
-    void changeValue(const QByteArray &name, const QVariant &value);
-    void changeExpression(const QByteArray &name, const QString &expression);
-    void removeProperty(const QByteArray &name);
-    QVariant value(const QByteArray &name) const;
-    QString expression(const QByteArray &name) const;
+    bool containsProperty(const QString &name) const;
+    bool containsValue(const QString &name) const;
+    bool containsExpression(const QString &name) const;
+    void changeValue(const QString &name, const QVariant &value);
+    void changeExpression(const QString &name, const QString &expression);
+    void removeProperty(const QString &name);
+    QVariant value(const QString &name) const;
+    QString expression(const QString &name) const;
 
     void detachFromState();
     void attachToState();
 
-    QVariant property(const QByteArray &name) const;
+    QVariant property(const QString &name) const;
 };
 
 class QDeclarativePropertyChangesParser : public QDeclarativeCustomParser
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index c41d39a..5a4e2b1 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -66,7 +66,7 @@ QDeclarativeAction::QDeclarativeAction()
 QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
                const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), 
-  property(target, propertyName), toValue(value), 
+  property(target, propertyName, qmlEngine(target)), toValue(value),
   fromBinding(0), event(0),
   specifiedObject(target), specifiedProperty(propertyName)
 {
@@ -373,7 +373,7 @@ void QDeclarativeAction::deleteFromBinding()
     }
 }
 
-bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByteArray &name) const
+bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -382,7 +382,7 @@ bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByt
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return true;
         }
     }
@@ -390,7 +390,7 @@ bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByt
     return false;
 }
 
-bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArray &name, const QVariant &revertValue)
+bool QDeclarativeState::changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue)
 {
     Q_D(QDeclarativeState);
 
@@ -399,7 +399,7 @@ bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArra
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name) {
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                     simpleAction.setValue(revertValue);
                     return true;
             }
@@ -409,7 +409,7 @@ bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArra
     return false;
 }
 
-bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteArray &name, QDeclarativeAbstractBinding *binding)
+bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding)
 {
     Q_D(QDeclarativeState);
 
@@ -418,7 +418,7 @@ bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteAr
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name) {
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                 if (simpleAction.binding())
                     simpleAction.binding()->destroy();
 
@@ -431,7 +431,7 @@ bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteAr
     return false;
 }
 
-bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QByteArray &name)
+bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QString &name)
 {
     Q_D(QDeclarativeState);
 
@@ -440,7 +440,7 @@ bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QByteAr
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.property().object() == target && simpleAction.property().name().toUtf8() == name) {
+            if (simpleAction.property().object() == target && simpleAction.property().name() == name) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
                 if (oldBinding) {
                     QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
@@ -520,7 +520,7 @@ void QDeclarativeState::addEntriesToRevertList(const QList<QDeclarativeAction> &
     }
 }
 
-QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray &name) const
+QVariant QDeclarativeState::valueInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -529,7 +529,7 @@ QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.value();
         }
     }
@@ -537,7 +537,7 @@ QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray
     return QVariant();
 }
 
-QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *target, const QByteArray &name) const
+QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -546,7 +546,7 @@ QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *tar
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.binding();
         }
     }
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 4a0b4ff..60d0e0b 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -45,7 +45,7 @@
 #include <qdeclarative.h>
 #include <qdeclarativeproperty.h>
 #include <QtCore/qobject.h>
-#include <private/qdeclarativebinding_p.h>
+#include <QtCore/qsharedpointer.h>
 #include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
@@ -76,7 +76,7 @@ public:
     QVariant toValue;
 
     QDeclarativeAbstractBinding *fromBinding;
-    QDeclarativeAbstractBinding::Pointer toBinding;
+    QWeakPointer<QDeclarativeAbstractBinding> toBinding;
     QDeclarativeActionEvent *event;
 
     //strictly for matching
@@ -180,15 +180,15 @@ public:
     QDeclarativeStateGroup *stateGroup() const;
     void setStateGroup(QDeclarativeStateGroup *);
 
-    bool containsPropertyInRevertList(QObject *target, const QByteArray &name) const;
-    bool changeValueInRevertList(QObject *target, const QByteArray &name, const QVariant &revertValue);
-    bool changeBindingInRevertList(QObject *target, const QByteArray &name, QDeclarativeAbstractBinding *binding);
-    bool removeEntryFromRevertList(QObject *target, const QByteArray &name);
+    bool containsPropertyInRevertList(QObject *target, const QString &name) const;
+    bool changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue);
+    bool changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding);
+    bool removeEntryFromRevertList(QObject *target, const QString &name);
     void addEntryToRevertList(const QDeclarativeAction &action);
     void removeAllEntriesFromRevertList(QObject *target);
     void addEntriesToRevertList(const QList<QDeclarativeAction> &actions);
-    QVariant valueInRevertList(QObject *target, const QByteArray &name) const;
-    QDeclarativeAbstractBinding *bindingInRevertList(QObject *target, const QByteArray &name) const;
+    QVariant valueInRevertList(QObject *target, const QString &name) const;
+    QDeclarativeAbstractBinding *bindingInRevertList(QObject *target, const QString &name) const;
 
     bool isStateActive() const;
 
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 9a5aa66..9aca71f 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -83,6 +83,13 @@ public:
     QDeclarativeNullableValue<QDeclarativeScriptString> scaleString;
     QDeclarativeNullableValue<QDeclarativeScriptString> rotationString;
 
+    QDeclarativeNullableValue<qreal> x;
+    QDeclarativeNullableValue<qreal> y;
+    QDeclarativeNullableValue<qreal> width;
+    QDeclarativeNullableValue<qreal> height;
+    QDeclarativeNullableValue<qreal> scale;
+    QDeclarativeNullableValue<qreal> rotation;
+
     void doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore = 0);
 };
 
@@ -213,10 +220,21 @@ QDeclarativeScriptString QDeclarativeParentChange::x() const
     return d->xString.value;
 }
 
+void tryReal(QDeclarativeNullableValue<qreal> &value, const QString &string)
+{
+    bool ok = false;
+    qreal realValue = string.toFloat(&ok);
+    if (ok)
+        value = realValue;
+    else
+        value.invalidate();
+}
+
 void QDeclarativeParentChange::setX(QDeclarativeScriptString x)
 {
     Q_D(QDeclarativeParentChange);
     d->xString = x;
+    tryReal(d->x, x.script());
 }
 
 bool QDeclarativeParentChange::xIsSet() const
@@ -235,6 +253,7 @@ void QDeclarativeParentChange::setY(QDeclarativeScriptString y)
 {
     Q_D(QDeclarativeParentChange);
     d->yString = y;
+    tryReal(d->y, y.script());
 }
 
 bool QDeclarativeParentChange::yIsSet() const
@@ -253,6 +272,7 @@ void QDeclarativeParentChange::setWidth(QDeclarativeScriptString width)
 {
     Q_D(QDeclarativeParentChange);
     d->widthString = width;
+    tryReal(d->width, width.script());
 }
 
 bool QDeclarativeParentChange::widthIsSet() const
@@ -271,6 +291,7 @@ void QDeclarativeParentChange::setHeight(QDeclarativeScriptString height)
 {
     Q_D(QDeclarativeParentChange);
     d->heightString = height;
+    tryReal(d->height, height.script());
 }
 
 bool QDeclarativeParentChange::heightIsSet() const
@@ -289,6 +310,7 @@ void QDeclarativeParentChange::setScale(QDeclarativeScriptString scale)
 {
     Q_D(QDeclarativeParentChange);
     d->scaleString = scale;
+    tryReal(d->scale, scale.script());
 }
 
 bool QDeclarativeParentChange::scaleIsSet() const
@@ -307,6 +329,7 @@ void QDeclarativeParentChange::setRotation(QDeclarativeScriptString rotation)
 {
     Q_D(QDeclarativeParentChange);
     d->rotationString = rotation;
+    tryReal(d->rotation, rotation.script());
 }
 
 bool QDeclarativeParentChange::rotationIsSet() const
@@ -367,16 +390,15 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     a.event = this;
     actions << a;
 
+    QDeclarativeContext *ctxt = qmlContext(this);
+
     if (d->xString.isValid()) {
-        bool ok = false;
-        QString script = d->xString.value.script();
-        qreal x = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction xa(d->target, QLatin1String("x"), x);
+        if (d->x.isValid()) {
+            QDeclarativeAction xa(d->target, QLatin1String("x"), ctxt, d->x.value);
             actions << xa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("x")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->xString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("x"), ctxt));
             QDeclarativeAction xa;
             xa.property = newBinding->property();
             xa.toBinding = newBinding;
@@ -387,15 +409,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->yString.isValid()) {
-        bool ok = false;
-        QString script = d->yString.value.script();
-        qreal y = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ya(d->target, QLatin1String("y"), y);
+        if (d->y.isValid()) {
+            QDeclarativeAction ya(d->target, QLatin1String("y"), ctxt, d->y.value);
             actions << ya;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("y")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->yString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("y"), ctxt));
             QDeclarativeAction ya;
             ya.property = newBinding->property();
             ya.toBinding = newBinding;
@@ -406,15 +425,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->scaleString.isValid()) {
-        bool ok = false;
-        QString script = d->scaleString.value.script();
-        qreal scale = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction sa(d->target, QLatin1String("scale"), scale);
+        if (d->scale.isValid()) {
+            QDeclarativeAction sa(d->target, QLatin1String("scale"), ctxt, d->scale.value);
             actions << sa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("scale")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->scaleString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("scale"), ctxt));
             QDeclarativeAction sa;
             sa.property = newBinding->property();
             sa.toBinding = newBinding;
@@ -425,15 +441,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->rotationString.isValid()) {
-        bool ok = false;
-        QString script = d->rotationString.value.script();
-        qreal rotation = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ra(d->target, QLatin1String("rotation"), rotation);
+        if (d->rotation.isValid()) {
+            QDeclarativeAction ra(d->target, QLatin1String("rotation"), ctxt, d->rotation.value);
             actions << ra;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("rotation")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->rotationString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("rotation"), ctxt));
             QDeclarativeAction ra;
             ra.property = newBinding->property();
             ra.toBinding = newBinding;
@@ -444,15 +457,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->widthString.isValid()) {
-        bool ok = false;
-        QString script = d->widthString.value.script();
-        qreal width = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction wa(d->target, QLatin1String("width"), width);
+        if (d->width.isValid()) {
+            QDeclarativeAction wa(d->target, QLatin1String("width"), ctxt, d->width.value);
             actions << wa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("width")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->widthString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("width"), ctxt));
             QDeclarativeAction wa;
             wa.property = newBinding->property();
             wa.toBinding = newBinding;
@@ -463,15 +473,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->heightString.isValid()) {
-        bool ok = false;
-        QString script = d->heightString.value.script();
-        qreal height = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ha(d->target, QLatin1String("height"), height);
+        if (d->height.isValid()) {
+            QDeclarativeAction ha(d->target, QLatin1String("height"), ctxt, d->height.value);
             actions << ha;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("height")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->heightString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("height"), ctxt));
             QDeclarativeAction ha;
             ha.property = newBinding->property();
             ha.toBinding = newBinding;
@@ -1057,32 +1064,34 @@ QDeclarativeAnchorChanges::ActionList QDeclarativeAnchorChanges::actions()
     d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter"));
     d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline"));
 
+    QDeclarativeContext *ctxt = qmlContext(this);
+
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::LeftAnchor) {
-        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
+        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, ctxt);
         d->leftBinding->setTarget(d->leftProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::RightAnchor) {
-        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
+        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, ctxt);
         d->rightBinding->setTarget(d->rightProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
-        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
+        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, ctxt);
         d->hCenterBinding->setTarget(d->hCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::TopAnchor) {
-        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
+        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, ctxt);
         d->topBinding->setTarget(d->topProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BottomAnchor) {
-        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
+        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, ctxt);
         d->bottomBinding->setTarget(d->bottomProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
-        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
+        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, ctxt);
         d->vCenterBinding->setTarget(d->vCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BaselineAnchor) {
-        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
+        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, ctxt);
         d->baselineBinding->setTarget(d->baselineProp);
     }
 
@@ -1362,24 +1371,25 @@ QList<QDeclarativeAction> QDeclarativeAnchorChanges::additionalActions()
     bool vChange = combined & QDeclarativeAnchors::Vertical_Mask;
 
     if (d->target) {
+        QDeclarativeContext *ctxt = qmlContext(this);
         QDeclarativeAction a;
         if (hChange && d->fromX != d->toX) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("x"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("x"), ctxt);
             a.toValue = d->toX;
             extra << a;
         }
         if (vChange && d->fromY != d->toY) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("y"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("y"), ctxt);
             a.toValue = d->toY;
             extra << a;
         }
         if (hChange && d->fromWidth != d->toWidth) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("width"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("width"), ctxt);
             a.toValue = d->toWidth;
             extra << a;
         }
         if (vChange && d->fromHeight != d->toHeight) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("height"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("height"), ctxt);
             a.toValue = d->toHeight;
             extra << a;
         }
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 0544f22..f32f390 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -66,6 +66,7 @@
 #include "private/qdeclarativetimer_p.h"
 #include "private/qdeclarativetransitionmanager_p_p.h"
 #include "private/qdeclarativetransition_p.h"
+#include "private/qdeclarativeapplication_p.h"
 #include "qdeclarativeview.h"
 #include "qdeclarativeinfo.h"
 #include "private/qdeclarativetypenotavailable_p.h"
@@ -75,6 +76,8 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
+    qmlRegisterUncreatableType<QDeclarativeApplication>("QtQuick",1,1,"Application", QDeclarativeApplication::tr("Application is an abstract class"));
+
     qmlRegisterType<QDeclarativeAnchorAnimation>("QtQuick",1,0,"AnchorAnimation");
     qmlRegisterType<QDeclarativeAnchorChanges>("QtQuick",1,0,"AnchorChanges");
     qmlRegisterType<QDeclarativeBehavior>("QtQuick",1,0,"Behavior");
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 416d8e2..c2e5efe 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -77,7 +77,7 @@ extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
 class QDeclarativeScene : public QGraphicsScene
 {
 public:
-    QDeclarativeScene();
+    QDeclarativeScene(QObject *parent = 0);
 
 protected:
     virtual void keyPressEvent(QKeyEvent *);
@@ -88,7 +88,7 @@ protected:
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
 };
 
-QDeclarativeScene::QDeclarativeScene()
+QDeclarativeScene::QDeclarativeScene(QObject *parent) : QGraphicsScene(parent)
 {
 }
 
@@ -132,7 +132,8 @@ class QDeclarativeViewPrivate : public QGraphicsViewPrivate, public QDeclarative
     Q_DECLARE_PUBLIC(QDeclarativeView)
 public:
     QDeclarativeViewPrivate()
-        : root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0), resizeMode(QDeclarativeView::SizeViewToRootObject), initialSize(0,0) {}
+        : root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0),
+          resizeMode(QDeclarativeView::SizeViewToRootObject), initialSize(0,0) {}
     ~QDeclarativeViewPrivate() { delete root; delete engine; }
     void execute();
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
@@ -155,8 +156,6 @@ public:
     QElapsedTimer frameTimer;
 
     void init();
-
-    QDeclarativeScene scene;
 };
 
 void QDeclarativeViewPrivate::execute()
@@ -234,6 +233,9 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
     you can connect to the statusChanged() signal and monitor for QDeclarativeView::Error.
     The errors are available via QDeclarativeView::errors().
 
+    If you're using your own QGraphicsScene-based scene with QDeclarativeView, remember to
+    enable scene's sticky focus mode and to set itemIndexMethod to QGraphicsScene::NoIndex.
+
     \sa {Integrating QML with existing Qt UI code}, {Using QML in C++ Applications}
 */
 
@@ -277,7 +279,7 @@ void QDeclarativeViewPrivate::init()
 {
     Q_Q(QDeclarativeView);
     engine = new QDeclarativeEngine();
-    q->setScene(&scene);
+    q->setScene(new QDeclarativeScene(q));
 
     q->setOptimizationFlags(QGraphicsView::DontSavePainterState);
     q->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -286,11 +288,11 @@ void QDeclarativeViewPrivate::init()
 
     // These seem to give the best performance
     q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
-    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+    q->scene()->setItemIndexMethod(QGraphicsScene::NoIndex);
     q->viewport()->setFocusPolicy(Qt::NoFocus);
     q->setFocusPolicy(Qt::StrongFocus);
 
-    scene.setStickyFocus(true);  //### needed for correct focus handling
+    q->scene()->setStickyFocus(true);  //### needed for correct focus handling
 }
 
 /*!
@@ -557,14 +559,14 @@ void QDeclarativeView::continueExecute()
 void QDeclarativeView::setRootObject(QObject *obj)
 {
     Q_D(QDeclarativeView);
-    if (d->root == obj)
+    if (d->root == obj || !scene())
         return;
     if (QDeclarativeItem *declarativeItem = qobject_cast<QDeclarativeItem *>(obj)) {
-        d->scene.addItem(declarativeItem);
+        scene()->addItem(declarativeItem);
         d->root = declarativeItem;
         d->declarativeItemRoot = declarativeItem;
     } else if (QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(obj)) {
-        d->scene.addItem(graphicsObject);
+        scene()->addItem(graphicsObject);
         d->root = graphicsObject;
         if (graphicsObject->isWidget()) {
             d->graphicsWidgetRoot = static_cast<QGraphicsWidget*>(graphicsObject);
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 6b13e88..cf3696b 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -387,7 +387,7 @@ void QDeclarativeXmlQuery::doSubQueryJob()
     for (int i = 0; i < queries.size(); ++i) {
         QList<QVariant> resultList;
         if (!queries[i].isEmpty()) {
-            subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + queries[i] + QLatin1String(" return if ($v) then ") + queries[i] + QLatin1String(" else \"\")"));
+            subquery.setQuery(m_prefix + QLatin1String("(let $v := string(") + queries[i] + QLatin1String(") return if ($v) then ") + queries[i] + QLatin1String(" else \"\")"));
             if (subquery.isValid()) {
                 QXmlResultItems resultItems;
                 subquery.evaluateTo(&resultItems);
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index fd57144..62fa8f1 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
+    $$PWD/qdeclarativeapplication.cpp \
     $$PWD/qdeclarativeutilmodule.cpp\
     $$PWD/qdeclarativeview.cpp \
     $$PWD/qdeclarativeconnections.cpp \
@@ -30,6 +31,7 @@ SOURCES += \
     $$PWD/qlistmodelinterface.cpp
 
 HEADERS += \
+    $$PWD/qdeclarativeapplication_p.h \
     $$PWD/qdeclarativeutilmodule_p.h\
     $$PWD/qdeclarativeview.h \
     $$PWD/qdeclarativeconnections_p.h \