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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits)
  QDeclarativeDebug: Make autotests more robust
  Add sendParentChangeNotification to QGraphicsItem
  Use setParentItem() instead of setParentItemHelper if componentComplete is true
  QDeclarativeDebugClient: Make sure status is consistent
  Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
  Doc clarification.
  Fallback to A8 text rendering on Mac when LCD smoothing is disabled
  Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1
  Autotest that new "import Qt 4.7"s aren't added accidentally
  Document "import QtQuick 1.0" change
  Replace "import Qt 4.7" with "import QtQuick 1.0"
  Add test for Qt 4.7 module
  Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
  Correct property type of PathAttribute::value in the docs.
  Register QtQuick 1.0 module.
  Remove unused AST node destructors.
  Fix crash when trying to append a null transform to QDeclarativeItem.
  Documentation.
  Documentation fix for Flickable (mark content properties as real, not int).
  QDeclarativeDebugClient: Fix gcc warning
  ...

41 files changed, 1011 insertions, 566 deletions

diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
index 1ffe441..7a5e5f6 100644
--- a/src/declarative/debugger/qdeclarativedebug.cpp
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -55,10 +55,12 @@ public:
     QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
 
 protected:
+    virtual void statusChanged(Status status);
     virtual void messageReceived(const QByteArray &);
 
 private:
     QDeclarativeEngineDebugPrivate *priv;
+    friend class QDeclarativeEngineDebugPrivate;
 };
 
 class QDeclarativeEngineDebugPrivate : public QObjectPrivate
@@ -66,7 +68,9 @@ class QDeclarativeEngineDebugPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
 public:
     QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *);
+    ~QDeclarativeEngineDebugPrivate();
 
+    void statusChanged(QDeclarativeEngineDebug::Status status);
     void message(const QByteArray &);
 
     QDeclarativeEngineDebugClient *client;
@@ -93,12 +97,18 @@ QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugCo
                                            QDeclarativeEngineDebugPrivate *p)
 : QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
 {
-    setEnabled(true);
+}
+
+void QDeclarativeEngineDebugClient::statusChanged(Status status)
+{
+    if (priv)
+        priv->statusChanged(static_cast<QDeclarativeEngineDebug::Status>(status));
 }
 
 void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
 {
-    priv->message(data);
+    if (priv)
+        priv->message(data);
 }
 
 QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *c)
@@ -106,6 +116,12 @@ QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebug
 {
 }
 
+QDeclarativeEngineDebugPrivate::~QDeclarativeEngineDebugPrivate()
+{
+    if (client)
+        client->priv = 0;
+}
+
 int QDeclarativeEngineDebugPrivate::getId()
 {
     return nextId++;
@@ -228,6 +244,11 @@ void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugCo
     }
 }
 
+void QDeclarativeEngineDebugPrivate::statusChanged(QDeclarativeEngineDebug::Status status)
+{
+    emit q_func()->statusChanged(status);
+}
+
 void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
 {
     QDataStream ds(data);
@@ -350,12 +371,19 @@ QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *cl
 {
 }
 
+QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status() const
+{
+    Q_D(const QDeclarativeEngineDebug);
+
+    return static_cast<QDeclarativeEngineDebug::Status>(d->client->status());
+}
+
 QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugPropertyReference &property, QObject *parent)
 {
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugPropertyWatch *watch = new QDeclarativeDebugPropertyWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -384,7 +412,7 @@ QDeclarativeDebugObjectExpressionWatch *QDeclarativeEngineDebug::addWatch(const
 {
     Q_D(QDeclarativeEngineDebug);
     QDeclarativeDebugObjectExpressionWatch *watch = new QDeclarativeDebugObjectExpressionWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -407,7 +435,7 @@ QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebu
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugWatch *watch = new QDeclarativeDebugWatch(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -443,7 +471,7 @@ void QDeclarativeEngineDebug::removeWatch(QDeclarativeDebugWatch *watch)
     
     d->watched.remove(watch->queryId());
 
-    if (d->client && d->client->isConnected()) {
+    if (d->client && d->client->status() == QDeclarativeDebugClient::Enabled) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("NO_WATCH") << watch->queryId();
@@ -456,7 +484,7 @@ QDeclarativeDebugEnginesQuery *QDeclarativeEngineDebug::queryAvailableEngines(QO
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugEnginesQuery *query = new QDeclarativeDebugEnginesQuery(parent);
-    if (d->client->isConnected()) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -478,7 +506,7 @@ QDeclarativeDebugRootContextQuery *QDeclarativeEngineDebug::queryRootContexts(co
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugRootContextQuery *query = new QDeclarativeDebugRootContextQuery(parent);
-    if (d->client->isConnected() && engine.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && engine.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -500,7 +528,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -523,7 +551,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->isConnected() && object.debugId() != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -546,7 +574,7 @@ QDeclarativeDebugExpressionQuery *QDeclarativeEngineDebug::queryExpressionResult
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugExpressionQuery *query = new QDeclarativeDebugExpressionQuery(parent);
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         query->m_client = this;
         query->m_expr = expr;
         int queryId = d->getId();
@@ -570,7 +598,7 @@ bool QDeclarativeEngineDebug::setBindingForObject(int objectDebugId, const QStri
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue;
@@ -585,7 +613,7 @@ bool QDeclarativeEngineDebug::resetBindingForObject(int objectDebugId, const QSt
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName;
@@ -601,7 +629,7 @@ bool QDeclarativeEngineDebug::setMethodBody(int objectDebugId, const QString &me
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->isConnected() && objectDebugId != -1) {
+    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody;
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index 2b1a115..3d83e8a 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -69,7 +69,11 @@ class Q_DECLARATIVE_EXPORT QDeclarativeEngineDebug : public QObject
 {
 Q_OBJECT
 public:
-    QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
+    enum Status { NotConnected, Unavailable, Enabled };
+
+    explicit QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
+
+    Status status() const;
 
     QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
                             QObject *parent = 0);
@@ -101,6 +105,7 @@ public:
 
 Q_SIGNALS:
     void newObjects();
+    void statusChanged(Status status);
 
 private:
     Q_DECLARE_PRIVATE(QDeclarativeEngineDebug)
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 2e52b40..977e58e 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -50,6 +50,20 @@
 
 QT_BEGIN_NAMESPACE
 
+const int protocolVersion = 1;
+const QString serverId = QLatin1String("QDeclarativeDebugServer");
+const QString clientId = QLatin1String("QDeclarativeDebugClient");
+
+class QDeclarativeDebugClientPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
+public:
+    QDeclarativeDebugClientPrivate();
+
+    QString name;
+    QDeclarativeDebugConnection *client;
+};
+
 class QDeclarativeDebugConnectionPrivate : public QObject
 {
     Q_OBJECT
@@ -58,40 +72,124 @@ public:
     QDeclarativeDebugConnection *q;
     QPacketProtocol *protocol;
 
-    QStringList enabled;
+    bool gotHello;
+    QStringList serverPlugins;
     QHash<QString, QDeclarativeDebugClient *> plugins;
+
+    void advertisePlugins();
+
 public Q_SLOTS:
     void connected();
     void readyRead();
 };
 
 QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
-: QObject(c), q(c), protocol(0)
+: QObject(c), q(c), protocol(0), gotHello(false)
 {
     protocol = new QPacketProtocol(q, this);
     QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
     QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
 }
 
+void QDeclarativeDebugConnectionPrivate::advertisePlugins()
+{
+    if (!q->isConnected() || !gotHello)
+        return;
+
+    QPacket pack;
+    pack << serverId << 1 << plugins.keys();
+    protocol->send(pack);
+    q->flush();
+}
+
 void QDeclarativeDebugConnectionPrivate::connected()
 {
     QPacket pack;
-    pack << QString(QLatin1String("QDeclarativeDebugServer")) << enabled;
+    pack << serverId << 0 << protocolVersion << plugins.keys();
     protocol->send(pack);
+    q->flush();
 }
 
 void QDeclarativeDebugConnectionPrivate::readyRead()
 {
-    QPacket pack = protocol->read();
-    QString name; QByteArray message;
-    pack >> name >> message;
+    if (!gotHello) {
+        QPacket pack = protocol->read();
+        QString name;
+
+        pack >> name;
+
+        bool validHello = false;
+        if (name == clientId) {
+            int op = -1;
+            pack >> op;
+            if (op == 0) {
+                int version = -1;
+                pack >> version;
+                if (version == protocolVersion) {
+                    pack >> serverPlugins;
+                    validHello = true;
+                }
+            }
+        }
 
-    QHash<QString, QDeclarativeDebugClient *>::Iterator iter = 
-        plugins.find(name);
-    if (iter == plugins.end()) {
-        qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
-    } else {
-        (*iter)->messageReceived(message);
+        if (!validHello) {
+            qWarning("QDeclarativeDebugConnection: Invalid hello message");
+            QObject::disconnect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
+            return;
+        }
+
+        gotHello = true;
+
+        QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+        for (; iter != plugins.end(); ++iter) {
+            QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+            if (serverPlugins.contains(iter.key()))
+                newStatus = QDeclarativeDebugClient::Enabled;
+            iter.value()->statusChanged(newStatus);
+        }
+    }
+
+    while (protocol->packetsAvailable()) {
+        QPacket pack = protocol->read();
+        QString name;
+        pack >> name;
+
+        if (name == clientId) {
+            int op = -1;
+            pack >> op;
+
+            if (op == 1) {
+                // Service Discovery
+                QStringList oldServerPlugins = serverPlugins;
+                pack >> serverPlugins;
+
+                QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+                for (; iter != plugins.end(); ++iter) {
+                    const QString pluginName = iter.key();
+                    QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+                    if (serverPlugins.contains(pluginName))
+                        newStatus = QDeclarativeDebugClient::Enabled;
+
+                    if (oldServerPlugins.contains(pluginName)
+                            != serverPlugins.contains(pluginName)) {
+                        iter.value()->statusChanged(newStatus);
+                    }
+                }
+            } else {
+                qWarning() << "QDeclarativeDebugConnection: Unknown control message id" << op;
+            }
+        } else {
+            QByteArray message;
+            pack >> message;
+
+            QHash<QString, QDeclarativeDebugClient *>::Iterator iter =
+                plugins.find(name);
+            if (iter == plugins.end()) {
+                qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
+            } else {
+                (*iter)->messageReceived(message);
+            }
+        }
     }
 }
 
@@ -100,24 +198,22 @@ QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
 {
 }
 
-bool QDeclarativeDebugConnection::isConnected() const
+QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
 {
-    return state() == ConnectedState;
+    QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+    for (; iter != d->plugins.end(); ++iter) {
+         iter.value()->d_func()->client = 0;
+         iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
+    }
 }
 
-class QDeclarativeDebugClientPrivate : public QObjectPrivate
+bool QDeclarativeDebugConnection::isConnected() const
 {
-    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
-public:
-    QDeclarativeDebugClientPrivate();
-
-    QString name;
-    QDeclarativeDebugConnection *client;
-    bool enabled;
-};
+    return state() == ConnectedState;
+}
 
 QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
-: client(0), enabled(false)
+: client(0)
 {
 }
 
@@ -137,65 +233,54 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
         d->client = 0;
     } else {
         d->client->d->plugins.insert(name, this);
+        d->client->d->advertisePlugins();
     }
 }
 
-QString QDeclarativeDebugClient::name() const
+QDeclarativeDebugClient::~QDeclarativeDebugClient()
 {
     Q_D(const QDeclarativeDebugClient);
-    return d->name;
+    if (d->client && d->client->d) {
+        d->client->d->plugins.remove(d->name);
+        d->client->d->advertisePlugins();
+    }
 }
 
-bool QDeclarativeDebugClient::isEnabled() const
+QString QDeclarativeDebugClient::name() const
 {
     Q_D(const QDeclarativeDebugClient);
-    return d->enabled;
-}
-
-void QDeclarativeDebugClient::setEnabled(bool e)
-{
-    Q_D(QDeclarativeDebugClient);
-    if (e == d->enabled)
-        return;
-
-    d->enabled = e;
-
-    if (d->client) {
-        if (e) 
-            d->client->d->enabled.append(d->name);
-        else
-            d->client->d->enabled.removeAll(d->name);
-
-        if (d->client->state() == QTcpSocket::ConnectedState) {
-            QPacket pack;
-            pack << QString(QLatin1String("QDeclarativeDebugServer"));
-            if (e) pack << (int)1;
-            else pack << (int)2;
-            pack << d->name;
-            d->client->d->protocol->send(pack);
-        }
-    }
+    return d->name;
 }
 
-bool QDeclarativeDebugClient::isConnected() const
+QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
 {
     Q_D(const QDeclarativeDebugClient);
+    if (!d->client
+            || !d->client->isConnected()
+            || !d->client->d->gotHello)
+        return NotConnected;
 
-    if (!d->client)
-        return false;
-    return d->client->isConnected();
+    if (d->client->d->serverPlugins.contains(d->name))
+        return Enabled;
+
+    return Unavailable;
 }
 
 void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
 {
     Q_D(QDeclarativeDebugClient);
 
-    if (!d->client || !d->client->isConnected())
+    if (status() != Enabled)
         return;
 
     QPacket pack;
     pack << d->name << message;
     d->client->d->protocol->send(pack);
+    d->client->d->q->flush();
+}
+
+void QDeclarativeDebugClient::statusChanged(Status)
+{
 }
 
 void QDeclarativeDebugClient::messageReceived(const QByteArray &)
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
index 4144a66..8d1706d 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -57,6 +57,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugConnection : public QTcpSocket
     Q_DISABLE_COPY(QDeclarativeDebugConnection)
 public:
     QDeclarativeDebugConnection(QObject * = 0);
+    ~QDeclarativeDebugConnection();
 
     bool isConnected() const;
 private:
@@ -73,18 +74,19 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugClient : public QObject
     Q_DISABLE_COPY(QDeclarativeDebugClient)
 
 public:
+    enum Status { NotConnected, Unavailable, Enabled };
+
     QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
+    ~QDeclarativeDebugClient();
 
     QString name() const;
 
-    bool isEnabled() const;
-    void setEnabled(bool);
-
-    bool isConnected() const;
+    Status status() const;
 
     void sendMessage(const QByteArray &);
 
 protected:
+    virtual void statusChanged(Status);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 1f2bf4f..d2ef00d 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -54,6 +54,30 @@
 
 QT_BEGIN_NAMESPACE
 
+/*
+  QDeclarativeDebug Protocol (Version 1):
+
+  handshake:
+    1. Client sends
+         "QDeclarativeDebugServer" 0 version pluginNames
+       version: an int representing the highest protocol version the client knows
+       pluginNames: plugins available on client side
+    2. Server sends
+         "QDeclarativeDebugClient" 0 version pluginNames
+       version: an int representing the highest protocol version the client & server know
+       pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
+  client plugin advertisement
+    1. Client sends
+         "QDeclarativeDebugServer" 1 pluginNames
+  server plugin advertisement
+    1. Server sends
+         "QDeclarativeDebugClient" 1 pluginNames
+  plugin communication:
+       Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
+  */
+
+const int protocolVersion = 1;
+
 class QDeclarativeDebugServerPrivate;
 class QDeclarativeDebugServer : public QObject
 {
@@ -82,11 +106,13 @@ class QDeclarativeDebugServerPrivate : public QObjectPrivate
 public:
     QDeclarativeDebugServerPrivate();
 
+    void advertisePlugins();
+
     int port;
     QTcpSocket *connection;
     QPacketProtocol *protocol;
     QHash<QString, QDeclarativeDebugService *> plugins;
-    QStringList enabledPlugins;
+    QStringList clientPlugins;
     QTcpServer *tcpServer;
     bool gotHello;
 };
@@ -106,6 +132,19 @@ QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate()
 {
 }
 
+void QDeclarativeDebugServerPrivate::advertisePlugins()
+{
+    if (!connection
+            || connection->state() != QTcpSocket::ConnectedState
+            || !gotHello)
+        return;
+
+    QPacket pack;
+    pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
+    protocol->send(pack);
+    connection->flush();
+}
+
 void QDeclarativeDebugServer::listen()
 {
     Q_D(QDeclarativeDebugServer);
@@ -144,7 +183,9 @@ void QDeclarativeDebugServer::newConnection()
 bool QDeclarativeDebugServer::hasDebuggingClient() const
 {
     Q_D(const QDeclarativeDebugServer);
-    return d->gotHello;
+    return d->connection
+            && (d->connection->state() == QTcpSocket::ConnectedState)
+            && d->gotHello;
 }
 
 QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
@@ -202,9 +243,13 @@ void QDeclarativeDebugServer::readyRead()
 
     if (!d->gotHello) {
         QPacket hello = d->protocol->read();
-        QString name; 
-        hello >> name >> d->enabledPlugins;
-        if (name != QLatin1String("QDeclarativeDebugServer")) {
+
+        QString name;
+        int op;
+        hello >> name >> op;
+
+        if (name != QLatin1String("QDeclarativeDebugServer")
+                || op != 0) {
             qWarning("QDeclarativeDebugServer: Invalid hello message");
             QObject::disconnect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
             d->protocol->deleteLater();
@@ -213,6 +258,23 @@ void QDeclarativeDebugServer::readyRead()
             d->connection = 0;
             return;
         }
+
+        int version;
+        hello >> version >> d->clientPlugins;
+
+        QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+        for (; iter != d->plugins.end(); ++iter) {
+            QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+            if (d->clientPlugins.contains(iter.key()))
+                newStatus = QDeclarativeDebugService::Enabled;
+            iter.value()->statusChanged(newStatus);
+        }
+
+        QPacket helloAnswer;
+        helloAnswer << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
+        d->protocol->send(helloAnswer);
+        d->connection->flush();
+
         d->gotHello = true;
         qWarning("QDeclarativeDebugServer: Connection established");
     }
@@ -226,32 +288,29 @@ void QDeclarativeDebugServer::readyRead()
         pack >> name;
 
         if (name == debugServer) {
-            int op = -1; QString plugin;
-            pack >> op >> plugin;
+            int op = -1;
+            pack >> op;
 
             if (op == 1) {
-                // Enable
-                if (!d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.append(plugin);
-                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(true);
-                }
-
-            } else if (op == 2) {
-                // Disable
-                if (d->enabledPlugins.contains(plugin)) {
-                    d->enabledPlugins.removeAll(plugin);
-                    QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                        d->plugins.find(plugin);
-                    if (iter != d->plugins.end())
-                        (*iter)->enabledChanged(false);
+                // Service Discovery
+                QStringList oldClientPlugins = d->clientPlugins;
+                pack >> d->clientPlugins;
+
+                QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+                for (; iter != d->plugins.end(); ++iter) {
+                    const QString pluginName = iter.key();
+                    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+                    if (d->clientPlugins.contains(pluginName))
+                        newStatus = QDeclarativeDebugService::Enabled;
+
+                    if (oldClientPlugins.contains(pluginName)
+                            != d->clientPlugins.contains(pluginName)) {
+                        iter.value()->statusChanged(newStatus);
+                    }
                 }
             } else {
                 qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
             }
-
         } else {
             QByteArray message;
             pack >> message;
@@ -287,6 +346,16 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject
         d->server = 0;
     } else {
         d->server->d_func()->plugins.insert(name, this);
+        d->server->d_func()->advertisePlugins();
+    }
+}
+
+QDeclarativeDebugService::~QDeclarativeDebugService()
+{
+    Q_D(const QDeclarativeDebugService);
+    if (d->server) {
+        d->server->d_func()->plugins.remove(d->name);
+        d->server->d_func()->advertisePlugins();
     }
 }
 
@@ -296,10 +365,16 @@ QString QDeclarativeDebugService::name() const
     return d->name;
 }
 
-bool QDeclarativeDebugService::isEnabled() const
+QDeclarativeDebugService::Status QDeclarativeDebugService::status() const
 {
     Q_D(const QDeclarativeDebugService);
-    return (d->server && d->server->d_func()->enabledPlugins.contains(d->name));
+    if (!d->server
+            || !d->server->hasDebuggingClient())
+        return NotConnected;
+    if (d->server->d_func()->clientPlugins.contains(d->name))
+        return Enabled;
+
+    return Unavailable;
 }
 
 namespace {
@@ -413,7 +488,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
 {
     Q_D(QDeclarativeDebugService);
 
-    if (!d->server || !d->server->d_func()->connection)
+    if (status() != Enabled)
         return;
 
     QPacket pack;
@@ -422,7 +497,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
     d->server->d_func()->connection->flush();
 }
 
-void QDeclarativeDebugService::enabledChanged(bool)
+void QDeclarativeDebugService::statusChanged(Status)
 {
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index c461ddf..0cadbe5 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -56,12 +56,15 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeDebugService)
     Q_DISABLE_COPY(QDeclarativeDebugService)
+
 public:
-    QDeclarativeDebugService(const QString &, QObject *parent = 0);
+    explicit QDeclarativeDebugService(const QString &, QObject *parent = 0);
+    ~QDeclarativeDebugService();
 
     QString name() const;
 
-    bool isEnabled() const;
+    enum Status { NotConnected, Unavailable, Enabled };
+    Status status() const;
 
     void sendMessage(const QByteArray &);
 
@@ -74,7 +77,7 @@ public:
     static bool hasDebuggingClient();
 
 protected:
-    virtual void enabledChanged(bool);
+    virtual void statusChanged(Status);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index b2b0c8a..03e2d56 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -78,7 +78,7 @@ void QDeclarativeDebugTrace::endRange(RangeType t)
 
 void QDeclarativeDebugTrace::addEventImpl(EventType event)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -89,7 +89,7 @@ void QDeclarativeDebugTrace::addEventImpl(EventType event)
 
 void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -100,7 +100,7 @@ void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
 
 void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &u)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
@@ -111,7 +111,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &u)
 
 void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
 {
-    if (!isEnabled())
+    if (status() != Enabled)
         return;
 
     QByteArray data;
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 84b0ccf..33c21b1 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -456,8 +456,8 @@ QDeclarativeFlickable::~QDeclarativeFlickable()
 }
 
 /*!
-    \qmlproperty int Flickable::contentX
-    \qmlproperty int Flickable::contentY
+    \qmlproperty real Flickable::contentX
+    \qmlproperty real Flickable::contentY
 
     These properties hold the surface coordinate currently at the top-left
     corner of the Flickable. For example, if you flick an image up 100 pixels,
@@ -1046,10 +1046,16 @@ void QDeclarativeFlickable::cancelFlick()
 void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
     QGraphicsObject *i = qobject_cast<QGraphicsObject *>(o);
-    if (i)
-        i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem);
-    else
+    if (i) {
+        QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(i);
+        if (static_cast<QDeclarativeItemPrivate*>(d)->componentComplete) {
+            i->setParentItem(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem);
+        } else {
+            d->setParentItemHelper(static_cast<QDeclarativeFlickablePrivate*>(prop->data)->contentItem, 0, 0);
+        }
+    } else {
         o->setParent(prop->object);
+    }
 }
 
 static inline int children_count_helper(QGraphicsObject *object)
@@ -1071,8 +1077,16 @@ static inline void children_clear_helper(QGraphicsObject *object)
 {
     QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(object);
     int childCount = d->children.count();
-    for (int index = 0 ;index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (static_cast<QDeclarativeItemPrivate*>(d)->componentComplete) {
+        for (int index = 0 ;index < childCount; index++) {
+            d->children.at(0)->setParentItem(0);
+        }
+    } else {
+        for (int index = 0 ;index < childCount; index++) {
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+        }
+    }
+
 }
 
 int QDeclarativeFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *prop)
@@ -1154,8 +1168,8 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
 }
 
 /*!
-    \qmlproperty int Flickable::contentWidth
-    \qmlproperty int Flickable::contentHeight
+    \qmlproperty real Flickable::contentWidth
+    \qmlproperty real Flickable::contentHeight
 
     The dimensions of the content (the surface controlled by Flickable). Typically this
     should be set to the combined size of the items placed in the Flickable. Note this
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index e9da4f7..250a43b 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE
     The following example moves the Y axis of the \l Rectangle elements while still allowing the \l Row element
     to lay the items out as if they had not been transformed:
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Row {
         Rectangle {
@@ -1614,7 +1614,13 @@ void QDeclarativeItemPrivate::data_append(QDeclarativeListProperty<QObject> *pro
     while (mo && mo != &QGraphicsObject::staticMetaObject) mo = mo->d.superdata;
 
     if (mo) {
-        QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(o))->setParentItemHelper(that, 0, 0);
+        QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(o);
+        QDeclarativeItemPrivate *contentItemPrivate = static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(graphicsObject));
+        if (contentItemPrivate->componentComplete) {
+            graphicsObject->setParentItem(that);
+        } else {
+            contentItemPrivate->setParentItemHelper(that, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+        }
     } else {
         o->setParent(that);
     }
@@ -1637,10 +1643,15 @@ static inline QObject *children_at_helper(QDeclarativeListProperty<QObject> *pro
 
 static inline void children_clear_helper(QDeclarativeListProperty<QObject> *prop)
 {
-    QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(prop->object));
+    QDeclarativeItemPrivate *d = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(prop->object)));
     int childCount = d->children.count();
-    for (int index = 0 ;index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (d->componentComplete) {
+        for (int index = 0 ;index < childCount; index++)
+            d->children.at(0)->setParentItem(0);
+    } else {
+        for (int index = 0 ;index < childCount; index++)
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    }
 }
 
 int QDeclarativeItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop)
@@ -1705,7 +1716,7 @@ int QDeclarativeItemPrivate::transform_count(QDeclarativeListProperty<QGraphicsT
 void QDeclarativeItemPrivate::transform_append(QDeclarativeListProperty<QGraphicsTransform> *list, QGraphicsTransform *item)
 {
     QGraphicsObject *object = qobject_cast<QGraphicsObject *>(list->object);
-    if (object) // QGraphicsItem applies the list in the wrong order, so we prepend.
+    if (object && item) // QGraphicsItem applies the list in the wrong order, so we prepend.
         QGraphicsItemPrivate::get(object)->prependGraphicsTransform(item);
 }
 
@@ -1745,8 +1756,8 @@ void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeN
     \qmlproperty list<Object> Item::data
     \default
 
-    The data property is allows you to freely mix visual children and resources
-    of an item.  If you assign a visual item to the data list it becomes
+    The data property allows you to freely mix visual children and resources
+    in an item.  If you assign a visual item to the data list it becomes
     a child and if you assign any other object type, it is added as a resource.
 
     So you can write:
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 783eff1..52703c2 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -97,7 +97,84 @@ void QDeclarativeItemModule::defineModule()
 {
     QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qgraphicsobject_autoParent };
     QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
+#ifdef QT_NO_MOVIE
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"AnimatedImage",
+        qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
+#else
+    qmlRegisterType<QDeclarativeAnimatedImage>("QtQuick",1,0,"AnimatedImage");
+#endif
+    qmlRegisterType<QDeclarativeBorderImage>("QtQuick",1,0,"BorderImage");
+    qmlRegisterType<QDeclarativeColumn>("QtQuick",1,0,"Column");
+    qmlRegisterType<QDeclarativeDrag>("QtQuick",1,0,"Drag");
+    qmlRegisterType<QDeclarativeFlickable>("QtQuick",1,0,"Flickable");
+    qmlRegisterType<QDeclarativeFlipable>("QtQuick",1,0,"Flipable");
+    qmlRegisterType<QDeclarativeFlow>("QtQuick",1,0,"Flow");
+    qmlRegisterType<QDeclarativeFocusPanel>("QtQuick",1,0,"FocusPanel");
+    qmlRegisterType<QDeclarativeFocusScope>("QtQuick",1,0,"FocusScope");
+    qmlRegisterType<QDeclarativeGradient>("QtQuick",1,0,"Gradient");
+    qmlRegisterType<QDeclarativeGradientStop>("QtQuick",1,0,"GradientStop");
+    qmlRegisterType<QDeclarativeGrid>("QtQuick",1,0,"Grid");
+    qmlRegisterType<QDeclarativeGridView>("QtQuick",1,0,"GridView");
+    qmlRegisterType<QDeclarativeImage>("QtQuick",1,0,"Image");
+    qmlRegisterType<QDeclarativeItem>("QtQuick",1,0,"Item");
+    qmlRegisterType<QDeclarativeLayoutItem>("QtQuick",1,0,"LayoutItem");
+    qmlRegisterType<QDeclarativeListView>("QtQuick",1,0,"ListView");
+    qmlRegisterType<QDeclarativeLoader>("QtQuick",1,0,"Loader");
+    qmlRegisterType<QDeclarativeMouseArea>("QtQuick",1,0,"MouseArea");
+    qmlRegisterType<QDeclarativePath>("QtQuick",1,0,"Path");
+    qmlRegisterType<QDeclarativePathAttribute>("QtQuick",1,0,"PathAttribute");
+    qmlRegisterType<QDeclarativePathCubic>("QtQuick",1,0,"PathCubic");
+    qmlRegisterType<QDeclarativePathLine>("QtQuick",1,0,"PathLine");
+    qmlRegisterType<QDeclarativePathPercent>("QtQuick",1,0,"PathPercent");
+    qmlRegisterType<QDeclarativePathQuad>("QtQuick",1,0,"PathQuad");
+    qmlRegisterType<QDeclarativePathView>("QtQuick",1,0,"PathView");
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QIntValidator>("QtQuick",1,0,"IntValidator");
+    qmlRegisterType<QDoubleValidator>("QtQuick",1,0,"DoubleValidator");
+    qmlRegisterType<QRegExpValidator>("QtQuick",1,0,"RegExpValidator");
+#endif
+    qmlRegisterType<QDeclarativeRectangle>("QtQuick",1,0,"Rectangle");
+    qmlRegisterType<QDeclarativeRepeater>("QtQuick",1,0,"Repeater");
+    qmlRegisterType<QGraphicsRotation>("QtQuick",1,0,"Rotation");
+    qmlRegisterType<QDeclarativeRow>("QtQuick",1,0,"Row");
+    qmlRegisterType<QDeclarativeTranslate>("QtQuick",1,0,"Translate");
+    qmlRegisterType<QGraphicsScale>("QtQuick",1,0,"Scale");
+    qmlRegisterType<QDeclarativeText>("QtQuick",1,0,"Text");
+    qmlRegisterType<QDeclarativeTextEdit>("QtQuick",1,0,"TextEdit");
+#ifndef QT_NO_LINEEDIT
+    qmlRegisterType<QDeclarativeTextInput>("QtQuick",1,0,"TextInput");
+#endif
+    qmlRegisterType<QDeclarativeViewSection>("QtQuick",1,0,"ViewSection");
+    qmlRegisterType<QDeclarativeVisualDataModel>("QtQuick",1,0,"VisualDataModel");
+    qmlRegisterType<QDeclarativeVisualItemModel>("QtQuick",1,0,"VisualItemModel");
 
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeKeyEvent>();
+    qmlRegisterType<QDeclarativeMouseEvent>();
+    qmlRegisterType<QGraphicsObject>();
+    qmlRegisterType<QGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("QtQuick",1,0,"QGraphicsWidget");
+    qmlRegisterType<QGraphicsTransform>();
+    qmlRegisterType<QDeclarativePathElement>();
+    qmlRegisterType<QDeclarativeCurve>();
+    qmlRegisterType<QDeclarativeScaleGrid>();
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QValidator>();
+#endif
+    qmlRegisterType<QDeclarativeVisualModel>();
+#ifndef QT_NO_ACTION
+    qmlRegisterType<QAction>();
+#endif
+    qmlRegisterType<QDeclarativePen>();
+    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
+#ifndef QT_NO_GRAPHICSEFFECT
+    qmlRegisterType<QGraphicsEffect>();
+#endif
+
+    qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("QtQuick",1,0,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
+    qmlRegisterUncreatableType<QDeclarativeKeysAttached>("QtQuick",1,0,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+
+#ifndef QT_NO_IMPORT_QT47_QML
 #ifdef QT_NO_MOVIE
     qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
         qApp->translate("QDeclarativeAnimatedImage","Qt was built without support for QMovie"));
@@ -149,29 +226,10 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeVisualDataModel>("Qt",4,7,"VisualDataModel");
     qmlRegisterType<QDeclarativeVisualItemModel>("Qt",4,7,"VisualItemModel");
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeKeyEvent>();
-    qmlRegisterType<QDeclarativeMouseEvent>();
-    qmlRegisterType<QGraphicsObject>();
     qmlRegisterType<QGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
     qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
-    qmlRegisterType<QGraphicsTransform>();
-    qmlRegisterType<QDeclarativePathElement>();
-    qmlRegisterType<QDeclarativeCurve>();
-    qmlRegisterType<QDeclarativeScaleGrid>();
-#ifndef QT_NO_VALIDATOR
-    qmlRegisterType<QValidator>();
-#endif
-    qmlRegisterType<QDeclarativeVisualModel>();
-#ifndef QT_NO_ACTION
-    qmlRegisterType<QAction>();
-#endif
-    qmlRegisterType<QDeclarativePen>();
-    qmlRegisterType<QDeclarativeFlickableVisibleArea>();
-#ifndef QT_NO_GRAPHICSEFFECT
-    qmlRegisterType<QGraphicsEffect>();
-#endif
 
     qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("Qt",4,7,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QDeclarativeKeysAttached>("Qt",4,7,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
+#endif
 }
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index f93357d..d526688 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -491,17 +491,17 @@ void QDeclarativeCurve::setY(qreal y)
     \since 4.7
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
 
-    The PathAttribute object allows attibutes consisting of a name and
-    a value to be specified for the endpoints of path segments.  The
+    The PathAttribute object allows attributes consisting of a name and
+    a value to be specified for various points along a path.  The
     attributes are exposed to the delegate as
     \l{qdeclarativeintroduction.html#attached-properties} {Attached Properties}.
-    The value of an attribute at any particular point is interpolated
-    from the PathAttributes bounding the point.
+    The value of an attribute at any particular point along the path is interpolated
+    from the PathAttributes bounding that point.
 
     The example below shows a path with the items scaled to 30% with
     opacity 50% at the top of the path and scaled 100% with opacity
-    100% at the bottom.  Note the use of the PathView.scale and
-    PathView.opacity attached properties to set the scale and opacity
+    100% at the bottom.  Note the use of the PathView.iconScale and
+    PathView.iconOpacity attached properties to set the scale and opacity
     of the delegate.
 
     \table
@@ -509,14 +509,17 @@ void QDeclarativeCurve::setY(qreal y)
     \o \image declarative-pathattribute.png
     \o
     \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 0
+    (see the PathView documentation for the specification of ContactModel.qml
+     used for ContactModel above.)
     \endtable
 
-   \sa Path
+
+    \sa Path
 */
 
 /*!
     \qmlproperty string PathAttribute::name
-    the name of the attribute to change.
+    This property holds the name of the attribute to change.
 
     This attribute will be available to the delegate as PathView.<name>
 
@@ -544,8 +547,39 @@ void QDeclarativePathAttribute::setName(const QString &name)
 }
 
 /*!
-   \qmlproperty string PathAttribute::value
-   the new value of the attribute.
+   \qmlproperty real PathAttribute::value
+   This property holds the value for the attribute.
+
+   The value specified can be used to influence the visual appearance
+   of an item along the path. For example, the following Path specifies
+   an attribute named \e itemRotation, which has the value \e 0 at the
+   beginning of the path, and the value 90 at the end of the path.
+
+   \qml
+   Path {
+       startX: 0
+       startY: 0
+       PathAttribute { name: "itemRotation"; value: 0 }
+       PathLine { x: 100; y: 100 }
+       PathAttribute { name: "itemRotation"; value: 90 }
+   }
+   \endqml
+
+   In our delegate, we can then bind the \e rotation property to the
+   \l{qdeclarativeintroduction.html#attached-properties} {Attached Property}
+   \e PathView.itemRotation created for this attribute.
+
+   \qml
+   Rectangle {
+       width: 10; height: 10
+       rotation: PathView.itemRotation
+   }
+   \endqml
+
+   As each item is positioned along the path, it will be rotated accordingly:
+   an item at the beginning of the path with be not be rotated, an item at
+   the end of the path will be rotated 90 degrees, and an item mid-way along
+   the path will be rotated 45 degrees.
 */
 
 /*!
@@ -792,6 +826,10 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
     \since 4.7
     \brief The PathPercent manipulates the way a path is interpreted.
 
+    PathPercent allows you to manipulate the spacing between items on a
+    PathView's path. You can use it to bunch together items on part of
+    the path, and spread them out on other parts of the path.
+
     The examples below show the normal distrubution of items along a path
     compared to a distribution which places 50% of the items along the
     PathLine section of the path.
@@ -800,25 +838,31 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
     \o \image declarative-nopercent.png
     \o
     \qml
-    Path {
-        startX: 20; startY: 0
-        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
-        PathLine { x: 150; y: 80 }
-        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
+    PathView {
+        ...
+        Path {
+            startX: 20; startY: 0
+            PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
+            PathLine { x: 150; y: 80 }
+            PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
+        }
     }
     \endqml
     \row
     \o \image declarative-percent.png
     \o
     \qml
-    Path {
-        startX: 20; startY: 0
-        PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
-        PathPercent { value: 0.25 }
-        PathLine { x: 150; y: 80 }
-        PathPercent { value: 0.75 }
-        PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
-        PathPercent { value: 1 }
+    PathView {
+        ...
+        Path {
+            startX: 20; startY: 0
+            PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
+            PathPercent { value: 0.25 }
+            PathLine { x: 150; y: 80 }
+            PathPercent { value: 0.75 }
+            PathQuad { x: 180; y: 0; controlX: 200; controlY: 80 }
+            PathPercent { value: 1 }
+        }
     }
     \endqml
     \endtable
@@ -826,6 +870,36 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
     \sa Path
 */
 
+/*!
+    \qmlproperty real value
+    The proporation of items that should be laid out up to this point.
+
+    This value should always be higher than the last value specified
+    by a PathPercent at a previous position in the Path.
+
+    In the following example we have a Path made up of three PathLines.
+    Normally, the items of the PathView would be laid out equally along
+    this path, with an equal number of items per line segment. PathPercent
+    allows us to specify that the first and third lines should each hold
+    10% of the laid out items, while the second line should hold the remaining
+    80%.
+
+    \qml
+    PathView {
+        ...
+        Path {
+            startX: 0; startY: 0
+            PathLine { x:100; y: 0; }
+            PathPercent { value: 0.1 }
+            PathLine { x: 100; y: 100 }
+            PathPercent { value: 0.9 }
+            PathLine { x: 100; y: 0 }
+            PathPercent { value: 1 }
+        }
+    }
+    \endqml
+*/
+
 qreal QDeclarativePathPercent::value() const
 {
     return _value;
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 3ac095c..6f5608a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1422,7 +1422,7 @@ void QDeclarativeTextEditPrivate::updateDefaultTextOption()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import Qt 4.7
+        import QtQuick 1.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
@@ -1473,7 +1473,7 @@ void QDeclarativeTextEdit::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \code
-        import Qt 4.7
+        import QtQuick 1.0
         TextEdit {
             id: textEdit
             text: "Hello world!"
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 5604b82..4817999 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -651,7 +651,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     input of integers between 11 and 31 into the text input:
 
     \code
-    import Qt 4.7
+    import QtQuick 1.0
     TextInput{
         validator: IntValidator{bottom: 11; top: 31;}
         focus: true
@@ -1334,7 +1334,7 @@ void QDeclarativeTextInput::moveCursorSelection(int position)
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import Qt 4.7
+        import QtQuick 1.0
         TextInput {
             id: textInput
             text: "Hello world!"
@@ -1385,7 +1385,7 @@ void QDeclarativeTextInput::openSoftwareInputPanel()
     Only relevant on platforms, which provide virtual keyboards.
 
     \qml
-        import Qt 4.7
+        import QtQuick 1.0
         TextInput {
             id: textInput
             text: "Hello world!"
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 21d1ea7..439f500 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -142,7 +142,7 @@ public:
 
     The example below places three colored rectangles in a ListView.
     \code
-    import Qt 4.7
+    import QtQuick 1.0
 
     Rectangle {
         VisualItemModel {
diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h
index 0623a2a..541ea7f 100644
--- a/src/declarative/qml/parser/qdeclarativejsast_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsast_p.h
@@ -224,6 +224,9 @@ public:
     inline Node()
         : kind(Kind_Undefined) {}
 
+    // NOTE: node destructors are never called,
+    //       instead we block free the memory
+    //       (see the NodePool class)
     virtual ~Node() {}
 
     virtual ExpressionNode *expressionCast();
@@ -247,7 +250,6 @@ class QML_PARSER_EXPORT ExpressionNode: public Node
 {
 public:
     ExpressionNode() {}
-    virtual ~ExpressionNode() {}
 
     virtual ExpressionNode *expressionCast();
 
@@ -259,7 +261,6 @@ class QML_PARSER_EXPORT Statement: public Node
 {
 public:
     Statement() {}
-    virtual ~Statement() {}
 
     virtual Statement *statementCast();
 
@@ -379,7 +380,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(ThisExpression)
 
     ThisExpression() { kind = K; }
-    virtual ~ThisExpression() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -401,8 +401,6 @@ public:
     IdentifierExpression(NameId *n):
         name (n) { kind = K; }
 
-    virtual ~IdentifierExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -422,7 +420,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(NullExpression)
 
     NullExpression() { kind = K; }
-    virtual ~NullExpression() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -442,7 +439,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(TrueLiteral)
 
     TrueLiteral() { kind = K; }
-    virtual ~TrueLiteral() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -462,7 +458,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(FalseLiteral)
 
     FalseLiteral() { kind = K; }
-    virtual ~FalseLiteral() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -483,7 +478,6 @@ public:
 
     NumericLiteral(double v):
         value(v) { kind = K; }
-    virtual ~NumericLiteral() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -506,8 +500,6 @@ public:
     StringLiteral(NameId *v):
         value (v) { kind = K; }
 
-    virtual ~StringLiteral() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -529,8 +521,6 @@ public:
     RegExpLiteral(NameId *p, int f):
         pattern (p), flags (f) { kind = K; }
 
-    virtual ~RegExpLiteral() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -562,8 +552,6 @@ public:
         elements (elts), elision (e)
         { kind = K; }
 
-    virtual ~ArrayLiteral() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -591,8 +579,6 @@ public:
     ObjectLiteral(PropertyNameAndValueList *plist):
         properties (plist) { kind = K; }
 
-    virtual ~ObjectLiteral() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -624,8 +610,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~ElementList() {}
-
     inline ElementList *finish ()
     {
         ElementList *front = next;
@@ -657,8 +641,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~Elision() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline Elision *finish ()
@@ -690,8 +672,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~PropertyNameAndValueList() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline PropertyNameAndValueList *finish ()
@@ -715,7 +695,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(PropertyName)
 
     PropertyName() { kind = K; }
-    virtual ~PropertyName() {}
 
 // attributes
     SourceLocation propertyNameToken;
@@ -729,8 +708,6 @@ public:
     IdentifierPropertyName(NameId *n):
         id (n) { kind = K; }
 
-    virtual ~IdentifierPropertyName() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -744,7 +721,6 @@ public:
 
     StringLiteralPropertyName(NameId *n):
         id (n) { kind = K; }
-    virtual ~StringLiteralPropertyName() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -759,7 +735,6 @@ public:
 
     NumericLiteralPropertyName(double n):
         id (n) { kind = K; }
-    virtual ~NumericLiteralPropertyName() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -776,8 +751,6 @@ public:
         base (b), expression (e)
         { kind = K; }
 
-    virtual ~ArrayMemberExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -802,8 +775,6 @@ public:
         base (b), name (n)
         { kind = K; }
 
-    virtual ~FieldMemberExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -828,8 +799,6 @@ public:
         base (b), arguments (a)
         { kind = K; }
 
-    virtual ~NewMemberExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -854,8 +823,6 @@ public:
     NewExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~NewExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -878,8 +845,6 @@ public:
         base (b), arguments (a)
         { kind = K; }
 
-    virtual ~CallExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -912,8 +877,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~ArgumentList() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline ArgumentList *finish ()
@@ -937,8 +900,6 @@ public:
     PostIncrementExpression(ExpressionNode *b):
         base (b) { kind = K; }
 
-    virtual ~PostIncrementExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -960,8 +921,6 @@ public:
     PostDecrementExpression(ExpressionNode *b):
         base (b) { kind = K; }
 
-    virtual ~PostDecrementExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -982,7 +941,6 @@ public:
 
     DeleteExpression(ExpressionNode *e):
         expression (e) { kind = K; }
-    virtual ~DeleteExpression() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -1005,8 +963,6 @@ public:
     VoidExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~VoidExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1028,8 +984,6 @@ public:
     TypeOfExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~TypeOfExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1051,8 +1005,6 @@ public:
     PreIncrementExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~PreIncrementExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1074,8 +1026,6 @@ public:
     PreDecrementExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~PreDecrementExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1097,8 +1047,6 @@ public:
     UnaryPlusExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~UnaryPlusExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1120,8 +1068,6 @@ public:
     UnaryMinusExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~UnaryMinusExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1143,8 +1089,6 @@ public:
     TildeExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~TildeExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1166,8 +1110,6 @@ public:
     NotExpression(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~NotExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1190,8 +1132,6 @@ public:
         left (l), op (o), right (r)
         { kind = K; }
 
-    virtual ~BinaryExpression() {}
-
     virtual BinaryExpression *binaryExpressionCast();
 
     virtual void accept0(Visitor *visitor);
@@ -1218,8 +1158,6 @@ public:
         expression (e), ok (t), ko (f)
         { kind = K; }
 
-    virtual ~ConditionalExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1244,8 +1182,6 @@ public:
     Expression(ExpressionNode *l, ExpressionNode *r):
         left (l), right (r) { kind = K; }
 
-    virtual ~Expression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1268,8 +1204,6 @@ public:
     Block(StatementList *slist):
         statements (slist) { kind = K; }
 
-    virtual ~Block() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1301,8 +1235,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~StatementList() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline StatementList *finish ()
@@ -1326,8 +1258,6 @@ public:
         declarations (vlist)
         { kind = K; }
 
-    virtual ~VariableStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1351,8 +1281,6 @@ public:
         name (n), expression (e), readOnly(false)
         { kind = K; }
 
-    virtual ~VariableDeclaration() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1379,8 +1307,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~VariableDeclarationList() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline VariableDeclarationList *finish (bool readOnly)
@@ -1407,7 +1333,6 @@ public:
     QDECLARATIVEJS_DECLARE_AST_NODE(EmptyStatement)
 
     EmptyStatement() { kind = K; }
-    virtual ~EmptyStatement() {}
 
     virtual void accept0(Visitor *visitor);
 
@@ -1429,8 +1354,6 @@ public:
     ExpressionStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~ExpressionStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1453,8 +1376,6 @@ public:
         expression (e), ok (t), ko (f)
         { kind = K; }
 
-    virtual ~IfStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1487,8 +1408,6 @@ public:
         statement (stmt), expression (e)
         { kind = K; }
 
-    virtual ~DoWhileStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1516,8 +1435,6 @@ public:
         expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~WhileStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1543,8 +1460,6 @@ public:
         initialiser (i), condition (c), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~ForStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1574,8 +1489,6 @@ public:
         declarations (vlist), condition (c), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~LocalForStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1606,8 +1519,6 @@ public:
         initialiser (i), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~ForEachStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1635,8 +1546,6 @@ public:
         declaration (v), expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~LocalForEachStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1664,8 +1573,6 @@ public:
     ContinueStatement(NameId *l = 0):
         label (l) { kind = K; }
 
-    virtual ~ContinueStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1689,8 +1596,6 @@ public:
     BreakStatement(NameId *l = 0):
         label (l) { kind = K; }
 
-    virtual ~BreakStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1714,8 +1619,6 @@ public:
     ReturnStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~ReturnStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1739,8 +1642,6 @@ public:
         expression (e), statement (stmt)
         { kind = K; }
 
-    virtual ~WithStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1766,8 +1667,6 @@ public:
         clauses (c), defaultClause (d), moreClauses (r)
         { kind = K; }
 
-    virtual ~CaseBlock() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1787,8 +1686,6 @@ public:
         expression (e), block (b)
         { kind = K; }
 
-    virtual ~SwitchStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1822,8 +1719,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~CaseClauses() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline CaseClauses *finish ()
@@ -1847,8 +1742,6 @@ public:
         expression (e), statements (slist)
         { kind = K; }
 
-    virtual ~CaseClause() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1867,8 +1760,6 @@ public:
         statements (slist)
         { kind = K; }
 
-    virtual ~DefaultClause() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1886,8 +1777,6 @@ public:
         label (l), statement (stmt)
         { kind = K; }
 
-    virtual ~LabelledStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1911,8 +1800,6 @@ public:
     ThrowStatement(ExpressionNode *e):
         expression (e) { kind = K; }
 
-    virtual ~ThrowStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -1936,8 +1823,6 @@ public:
         name (n), statement (stmt)
         { kind = K; }
 
-    virtual ~Catch() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1958,8 +1843,6 @@ public:
         statement (stmt)
         { kind = K; }
 
-    virtual ~Finally() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -1984,8 +1867,6 @@ public:
         statement (stmt), catchExpression (c), finallyExpression (0)
         { kind = K; }
 
-    virtual ~TryStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -2017,8 +1898,6 @@ public:
         name (n), formals (f), body (b)
         { kind = K; }
 
-    virtual ~FunctionExpression() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -2048,8 +1927,6 @@ public:
         FunctionExpression(n, f, b)
         { kind = K; }
 
-    virtual ~FunctionDeclaration() {}
-
     virtual void accept0(Visitor *visitor);
 };
 
@@ -2070,8 +1947,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~FormalParameterList() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline FormalParameterList *finish ()
@@ -2097,8 +1972,6 @@ public:
         elements (elts)
         { kind = K; }
 
-    virtual ~FunctionBody() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -2114,8 +1987,6 @@ public:
         elements (elts)
         { kind = K; }
 
-    virtual ~Program() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -2139,8 +2010,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~SourceElements() {}
-
     virtual void accept0(Visitor *visitor);
 
     inline SourceElements *finish ()
@@ -2162,8 +2031,6 @@ public:
 
     inline SourceElement()
         { kind = K; }
-
-    virtual ~SourceElement() {}
 };
 
 class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
@@ -2175,8 +2042,6 @@ public:
         declaration (f)
         { kind = K; }
 
-    virtual ~FunctionSourceElement() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -2192,8 +2057,6 @@ public:
         statement (stmt)
         { kind = K; }
 
-    virtual ~StatementSourceElement() {}
-
     virtual void accept0(Visitor *visitor);
 
 // attributes
@@ -2208,8 +2071,6 @@ public:
     DebuggerStatement()
         { kind = K; }
 
-    virtual ~DebuggerStatement() {}
-
     virtual void accept0(Visitor *visitor);
 
     virtual SourceLocation firstSourceLocation() const
@@ -2256,8 +2117,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~UiQualifiedId() {}
-
     UiQualifiedId *finish()
     {
         UiQualifiedId *head = next;
@@ -2459,8 +2318,6 @@ public:
         previous->next = this;
     }
 
-    virtual ~UiParameterList() {}
-
     virtual void accept0(Visitor *) {}
 
     inline UiParameterList *finish ()
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 9402596..5f0fd56 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -438,7 +438,7 @@ struct Instr {
             qint8 output;
             qint8 reg;
             quint8 exceptionId;
-            quint32 index;
+            quint32 id;
         } attached;
         struct {
             QML_INSTR_HEADER
@@ -988,7 +988,7 @@ static void dumpInstruction(const Instr *instr)
         qWarning().nospace() << "\t" << "LoadRoot" << "\t\t" << instr->load.index << "\t" << instr->load.reg;
         break;
     case Instr::LoadAttached:
-        qWarning().nospace() << "\t" << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.index;
+        qWarning().nospace() << "\t" << "LoadAttached" << "\t\t" << instr->attached.output << "\t" << instr->attached.reg << "\t" << instr->attached.id;
         break;
     case Instr::ConvertIntToReal:
         qWarning().nospace() << "\t" << "ConvertIntToReal" << "\t" << instr->unaryop.output << "\t" << instr->unaryop.src;
@@ -1225,7 +1225,7 @@ void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
             output.setUndefined();
         } else {
             QObject *attached = 
-                qmlAttachedPropertiesObjectById(instr->attached.index, 
+                qmlAttachedPropertiesObjectById(instr->attached.id, 
                                                 registers[instr->attached.reg].getQObject(), 
                                                 true);
             Q_ASSERT(attached);
@@ -1895,7 +1895,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
                 attach.common.type = Instr::LoadAttached;
                 attach.attached.output = reg;
                 attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
+                attach.attached.id = attachType->attachedPropertiesId();
                 attach.attached.exceptionId = exceptionId(nameNodes.at(ii));
                 bytecode << attach;
 
@@ -2011,7 +2011,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
                 attach.common.type = Instr::LoadAttached;
                 attach.attached.output = reg;
                 attach.attached.reg = reg;
-                attach.attached.index = attachType->index();
+                attach.attached.id = attachType->attachedPropertiesId();
                 bytecode << attach;
 
                 absType = 0;
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index e55dc92..90d38b3 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1286,7 +1286,7 @@ bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctx
 
 int QDeclarativeCompiler::componentTypeRef()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,7);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("QtQuick/Component",1,0);
     for (int ii = output->types.count() - 1; ii >= 0; --ii) {
         if (output->types.at(ii).type == t)
             return ii;
@@ -1407,7 +1407,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
             COMPILE_EXCEPTION(prop, tr("Invalid attached object assignment"));
 
         Q_ASSERT(type->attachedPropertiesFunction());
-        prop->index = type->index();
+        prop->index = type->attachedPropertiesId();
         prop->value->metatype = type->attachedPropertiesType();
     } else {
         // Setup regular property data
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 7f58166..b532b0c 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -78,7 +78,7 @@ class QByteArray;
     For example, if there is a \c main.qml file like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index de45a95..59d5cfa 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -85,7 +85,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context->setContextProperty("myModel", &modelData);
 
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 1.0\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
@@ -112,7 +112,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context->setContextObject(&myDataSet);
 
     QDeclarativeComponent component(&engine);
-    component.setData("import Qt 4.7\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 1.0\nListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
index 1a9b501..fa79425 100644
--- a/src/declarative/qml/qdeclarativedom.cpp
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -896,7 +896,7 @@ QByteArray QDeclarativeDomObject::customTypeData() const
 */
 bool QDeclarativeDomObject::isComponent() const
 {
-    return (d->object && d->object->typeName == "Qt/Component");
+    return (d->object && (d->object->typeName == "Qt/Component" || d->object->typeName == "QtQuick/Component"));
 }
 
 /*!
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 26b3629..724553f 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
     \qml
     // MyRect.qml
 
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200; height: 200
@@ -177,9 +177,15 @@ static bool qt_QmlQtModule_registered = false;
 
 void QDeclarativeEnginePrivate::defineModule()
 {
+    qmlRegisterType<QDeclarativeComponent>("QtQuick",1,0,"Component");
+    qmlRegisterType<QObject>("QtQuick",1,0,"QtObject");
+    qmlRegisterType<QDeclarativeWorkerScript>("QtQuick",1,0,"WorkerScript");
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component");
     qmlRegisterType<QObject>("Qt",4,7,"QtObject");
     qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript");
+#endif
 
     qmlRegisterType<QDeclarativeBinding>();
 }
@@ -198,7 +204,7 @@ with enums and functions.  To use it, call the members of the global \c Qt objec
 For example:
 
 \qml
-import Qt 4.7
+import QtQuick 1.0
 
 Text {
     color: Qt.rgba(255, 0, 0, 1)
@@ -510,7 +516,7 @@ QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine
   \code
   QDeclarativeEngine engine;
   QDeclarativeComponent component(&engine);
-  component.setData("import Qt 4.7\nText { text: \"Hello world!\" }", QUrl());
+  component.setData("import QtQuick 1.0\nText { text: \"Hello world!\" }", QUrl());
   QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
 
   //add item to view, etc
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 6fc4df0..77a1ba4 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -202,7 +202,7 @@ QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContex
     For example, given a file \c main.qml like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         width: 200; height: 200
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index a5c878f..7a78a1f 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -146,6 +146,7 @@ public:
     const QMetaObject *m_baseMetaObject;
     QDeclarativeAttachedPropertiesFunc m_attachedPropertiesFunc;
     const QMetaObject *m_attachedPropertiesType;
+    int m_attachedPropertiesId;
     int m_parserStatusCast;
     int m_propertyValueSourceCast;
     int m_propertyValueInterceptorCast;
@@ -155,8 +156,12 @@ public:
     QDeclarativeCustomParser *m_customParser;
     mutable volatile bool m_isSetup:1;
     mutable QList<QDeclarativeProxyMetaObject::ProxyData> m_metaObjects;
+
+    static QHash<const QMetaObject *, int> m_attachedPropertyIds;
 };
 
+QHash<const QMetaObject *, int> QDeclarativeTypePrivate::m_attachedPropertyIds;
+
 QDeclarativeTypePrivate::QDeclarativeTypePrivate()
 : m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), 
   m_allocationSize(0), m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
@@ -198,6 +203,14 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe
     d->m_baseMetaObject = type.metaObject;
     d->m_attachedPropertiesFunc = type.attachedPropertiesFunction;
     d->m_attachedPropertiesType = type.attachedPropertiesMetaObject;
+    if (d->m_attachedPropertiesType) {
+        QHash<const QMetaObject *, int>::Iterator iter = d->m_attachedPropertyIds.find(d->m_baseMetaObject);
+        if (iter == d->m_attachedPropertyIds.end())
+            iter = d->m_attachedPropertyIds.insert(d->m_baseMetaObject, index);
+        d->m_attachedPropertiesId = *iter;
+    } else {
+        d->m_attachedPropertiesId = -1;
+    }
     d->m_parserStatusCast = type.parserStatusCast;
     d->m_propertyValueSourceCast = type.valueSourceCast;
     d->m_propertyValueInterceptorCast = type.valueInterceptorCast;
@@ -461,6 +474,16 @@ const QMetaObject *QDeclarativeType::attachedPropertiesType() const
     return d->m_attachedPropertiesType;
 }
 
+/*
+This is the id passed to qmlAttachedPropertiesById().  This is different from the index
+for the case that a single class is registered under two or more names (eg. Item in 
+Qt 4.7 and QtQuick 1.0).
+*/
+int QDeclarativeType::attachedPropertiesId() const
+{
+    return d->m_attachedPropertiesId;
+}
+
 int QDeclarativeType::parserStatusCast() const
 {
     return d->m_parserStatusCast;
@@ -662,7 +685,7 @@ int QDeclarativeMetaType::attachedPropertiesFuncId(const QMetaObject *mo)
 
     QDeclarativeType *type = data->metaObjectToType.value(mo);
     if (type && type->attachedPropertiesFunction())
-        return type->index();
+        return type->attachedPropertiesId();
     else
         return -1;
 }
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index f410547..382abd2 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -137,6 +137,7 @@ public:
 
     QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
     const QMetaObject *attachedPropertiesType() const;
+    int attachedPropertiesId() const;
 
     int parserStatusCast() const;
     QVariant fromObject(QObject *) const;
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index d0dd2e8..bc20bff 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -220,7 +220,7 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
                 QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
                 if (!func) return; // Not an attachable type
 
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                currentObject = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), currentObject);
                 if (!currentObject) return; // Something is broken with the attachable type
             } else {
                 Q_ASSERT(data->typeNamespace);
@@ -232,7 +232,7 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
                 QDeclarativeAttachedPropertiesFunc func = data->type->attachedPropertiesFunction();
                 if (!func) return; // Not an attachable type
 
-                currentObject = qmlAttachedPropertiesObjectById(data->type->index(), currentObject);
+                currentObject = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), currentObject);
                 if (!currentObject) return; // Something is broken with the attachable type
             }
         } else {
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index 764a8db..cba7b4a 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -129,7 +129,7 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
             return 0;
         } else if (data->object) {
             // Must be an attached property
-            object = qmlAttachedPropertiesObjectById(data->type->index(), data->object);
+            object = qmlAttachedPropertiesObjectById(data->type->attachedPropertiesId(), data->object);
             if (!object) return 0;
             return ep->objectClass->queryProperty(object, name, flags, 0);
         }
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index fda62ee..b9e9cec 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT int qt_defaultDpi();
 
 template<typename T>
-int qmlRegisterValueTypeEnums(const char *qmlName)
+int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
     QByteArray name(T::staticMetaObject.className());
 
@@ -63,7 +63,7 @@ int qmlRegisterValueTypeEnums(const char *qmlName)
 
         QString(),
 
-        "Qt", 4, 7, qmlName, &T::staticMetaObject,
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
 
         0, 0,
 
@@ -99,8 +99,12 @@ bool QDeclarativeValueTypeFactory::isValueType(int idx)
 
 void QDeclarativeValueTypeFactory::registerValueTypes()
 {
-    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Easing");
-    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Font");
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("QtQuick",1,0,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("QtQuick",1,0,"Font");
+#ifndef QT_NO_IMPORT_QT47_QML
+    qmlRegisterValueTypeEnums<QDeclarativeEasingValueType>("Qt",4,7,"Easing");
+    qmlRegisterValueTypeEnums<QDeclarativeFontValueType>("Qt",4,7,"Font");
+#endif
 }
 
 QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index ba6f1e7..f2e6217 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -305,6 +305,8 @@ void QDeclarativeAbstractAnimation::componentFinalized()
     animation will finish playing normally but not restart.
 
     By default, the alwaysRunToEnd property is not set.
+
+    \note alwaysRunToEnd has no effect on animations in a Transition.
 */
 bool QDeclarativeAbstractAnimation::alwaysRunToEnd() const
 {
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 6879494..3e4a81a 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -157,7 +157,7 @@ QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts;
 
     For example:
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Column { 
         FontLoader { id: fixedFont; name: "Courier" }
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index 56320e6..c240f22 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -82,7 +82,7 @@ public:
     object to access the current time.
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     Item {
         Timer {
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index c5bfebd..0544f22 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -75,6 +75,55 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
+    qmlRegisterType<QDeclarativeAnchorAnimation>("QtQuick",1,0,"AnchorAnimation");
+    qmlRegisterType<QDeclarativeAnchorChanges>("QtQuick",1,0,"AnchorChanges");
+    qmlRegisterType<QDeclarativeBehavior>("QtQuick",1,0,"Behavior");
+    qmlRegisterType<QDeclarativeBind>("QtQuick",1,0,"Binding");
+    qmlRegisterType<QDeclarativeColorAnimation>("QtQuick",1,0,"ColorAnimation");
+    qmlRegisterType<QDeclarativeConnections>("QtQuick",1,0,"Connections");
+    qmlRegisterType<QDeclarativeSmoothedAnimation>("QtQuick",1,0,"SmoothedAnimation");
+    qmlRegisterType<QDeclarativeFontLoader>("QtQuick",1,0,"FontLoader");
+    qmlRegisterType<QDeclarativeListElement>("QtQuick",1,0,"ListElement");
+    qmlRegisterType<QDeclarativeNumberAnimation>("QtQuick",1,0,"NumberAnimation");
+    qmlRegisterType<QDeclarativePackage>("QtQuick",1,0,"Package");
+    qmlRegisterType<QDeclarativeParallelAnimation>("QtQuick",1,0,"ParallelAnimation");
+    qmlRegisterType<QDeclarativeParentAnimation>("QtQuick",1,0,"ParentAnimation");
+    qmlRegisterType<QDeclarativeParentChange>("QtQuick",1,0,"ParentChange");
+    qmlRegisterType<QDeclarativePauseAnimation>("QtQuick",1,0,"PauseAnimation");
+    qmlRegisterType<QDeclarativePropertyAction>("QtQuick",1,0,"PropertyAction");
+    qmlRegisterType<QDeclarativePropertyAnimation>("QtQuick",1,0,"PropertyAnimation");
+    qmlRegisterType<QDeclarativeRotationAnimation>("QtQuick",1,0,"RotationAnimation");
+    qmlRegisterType<QDeclarativeScriptAction>("QtQuick",1,0,"ScriptAction");
+    qmlRegisterType<QDeclarativeSequentialAnimation>("QtQuick",1,0,"SequentialAnimation");
+    qmlRegisterType<QDeclarativeSpringAnimation>("QtQuick",1,0,"SpringAnimation");
+    qmlRegisterType<QDeclarativeStateChangeScript>("QtQuick",1,0,"StateChangeScript");
+    qmlRegisterType<QDeclarativeStateGroup>("QtQuick",1,0,"StateGroup");
+    qmlRegisterType<QDeclarativeState>("QtQuick",1,0,"State");
+    qmlRegisterType<QDeclarativeSystemPalette>("QtQuick",1,0,"SystemPalette");
+    qmlRegisterType<QDeclarativeTimer>("QtQuick",1,0,"Timer");
+    qmlRegisterType<QDeclarativeTransition>("QtQuick",1,0,"Transition");
+    qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",1,0,"Vector3dAnimation");
+#ifdef QT_NO_XMLPATTERNS
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlListModel",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+    qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlRole",
+        qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns"));
+#else
+    qmlRegisterType<QDeclarativeXmlListModel>("QtQuick",1,0,"XmlListModel");
+    qmlRegisterType<QDeclarativeXmlListModelRole>("QtQuick",1,0,"XmlRole");
+#endif
+
+    qmlRegisterType<QDeclarativeAnchors>();
+    qmlRegisterType<QDeclarativeStateOperation>();
+    qmlRegisterType<QDeclarativeAnchorSet>();
+
+    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",1,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
+
+    qmlRegisterCustomType<QDeclarativeListModel>("QtQuick",1,0,"ListModel", new QDeclarativeListModelParser);
+    qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",1,0,"PropertyChanges", new QDeclarativePropertyChangesParser);
+    qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",1,0,"Connections", new QDeclarativeConnectionsParser);
+
+#ifndef QT_NO_IMPORT_QT47_QML
     qmlRegisterType<QDeclarativeAnchorAnimation>("Qt",4,7,"AnchorAnimation");
     qmlRegisterType<QDeclarativeAnchorChanges>("Qt",4,7,"AnchorChanges");
     qmlRegisterType<QDeclarativeBehavior>("Qt",4,7,"Behavior");
@@ -113,13 +162,10 @@ void QDeclarativeUtilModule::defineModule()
     qmlRegisterType<QDeclarativeXmlListModelRole>("Qt",4,7,"XmlRole");
 #endif
 
-    qmlRegisterType<QDeclarativeAnchors>();
-    qmlRegisterType<QDeclarativeStateOperation>();
-    qmlRegisterType<QDeclarativeAnchorSet>();
-
     qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
 
     qmlRegisterCustomType<QDeclarativeListModel>("Qt", 4,7, "ListModel", new QDeclarativeListModelParser);
     qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
     qmlRegisterCustomType<QDeclarativeConnections>("Qt", 4, 7, "Connections", new QDeclarativeConnectionsParser);
+#endif
 }
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index f0ed80b..24edc89 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -531,7 +531,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
     A XmlListModel could create a model from this data, like this:
 
     \qml
-    import Qt 4.7
+    import QtQuick 1.0
 
     XmlListModel {
         id: xmlModel
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index b404692..3b18c31 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7669,7 +7669,12 @@ void QGraphicsObject::updateMicroFocus()
 
 void QGraphicsItemPrivate::children_append(QDeclarativeListProperty<QGraphicsObject> *list, QGraphicsObject *item)
 {
-    QGraphicsItemPrivate::get(item)->setParentItemHelper(static_cast<QGraphicsObject *>(list->object), /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(list->object);
+    if (QGraphicsItemPrivate::get(graphicsObject)->sendParentChangeNotification) {
+        item->setParentItem(graphicsObject);
+    } else {
+        QGraphicsItemPrivate::get(item)->setParentItemHelper(graphicsObject, 0, 0);
+    }
 }
 
 int QGraphicsItemPrivate::children_count(QDeclarativeListProperty<QGraphicsObject> *list)
@@ -7691,8 +7696,13 @@ void QGraphicsItemPrivate::children_clear(QDeclarativeListProperty<QGraphicsObje
 {
     QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
     int childCount = d->children.count();
-    for (int index = 0; index < childCount; index++)
-        QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, /*newParentVariant=*/0, /*thisPointerVariant=*/0);
+    if (d->sendParentChangeNotification) {
+        for (int index = 0; index < childCount; index++)
+            d->children.at(0)->setParentItem(0);
+    } else {
+        for (int index = 0; index < childCount; index++)
+            QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, 0, 0);
+    }
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 77e4054..c8a7699 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -238,6 +238,7 @@ public:
         pendingPolish(0),
         mayHaveChildWithGraphicsEffect(0),
         isDeclarativeItem(0),
+        sendParentChangeNotification(0),
         globalStackingOrder(-1),
         q_ptr(0)
     {
@@ -584,7 +585,8 @@ public:
     quint32 pendingPolish : 1;
     quint32 mayHaveChildWithGraphicsEffect : 1;
     quint32 isDeclarativeItem : 1;
-    quint32 padding : 23;
+    quint32 sendParentChangeNotification : 1;
+    quint32 padding : 22;
 
     // Optional stacking order
     int globalStackingOrder;
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index edb69bc..3bd4b43 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -637,7 +637,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
     snow, the lower one has particles expelled up like a fountain.
 
     \qml
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.particles 1.0
 
 Rectangle {
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 40b3641..ac87784 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -41,6 +41,7 @@
 
 #include "qglengineshadermanager_p.h"
 #include "qglengineshadersource_p.h"
+#include "qpaintengineex_opengl2_p.h"
 
 #if defined(QT_DEBUG)
 #include <QMetaEnum>
@@ -248,6 +249,7 @@ QByteArray QGLEngineSharedShaders::snippetNameStr(SnippetName name)
 #endif
 
 // The address returned here will only be valid until next time this function is called.
+// The program is return bound.
 QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineShaderProg &prog)
 {
     for (int i = 0; i < cachedPrograms.size(); ++i) {
@@ -255,6 +257,7 @@ QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineS
         if (*cachedProg == prog) {
             // Move the program to the top of the list as a poor-man's cache algo
             cachedPrograms.move(i, 0);
+            cachedProg->program->bind();
             return cachedProg;
         }
     }
@@ -355,6 +358,14 @@ QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineS
             qWarning() << error;
             break;
         }
+
+        newProg->program->bind();
+
+        if (newProg->maskFragShader != QGLEngineSharedShaders::NoMaskFragmentShader) {
+            GLuint location = newProg->program->uniformLocation("maskTexture");
+            newProg->program->setUniformValue(location, QT_MASK_TEXTURE_UNIT);
+        }
+
         if (cachedPrograms.count() > 30) {
             // The cache is full, so delete the last 5 programs in the list.
             // These programs will be least used, as a program us bumped to
@@ -769,10 +780,8 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
     // At this point, requiredProgram is fully populated so try to find the program in the cache
     currentShaderProg = sharedShaders->findProgramInCache(requiredProgram);
 
-    if (currentShaderProg) {
-        currentShaderProg->program->bind();
-        if (useCustomSrc)
-            customSrcStage->setUniforms(currentShaderProg->program);
+    if (currentShaderProg && useCustomSrc) {
+        customSrcStage->setUniforms(currentShaderProg->program);
     }
 
     // Make sure all the vertex attribute arrays the program uses are enabled (and the ones it
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index ee59830..a81ed8e 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -98,6 +98,10 @@ QT_BEGIN_NAMESPACE
 extern Q_GUI_EXPORT bool qt_cleartype_enabled;
 #endif
 
+#ifdef Q_WS_MAC
+extern bool qt_applefontsmoothing_enabled;
+#endif
+
 extern QImage qt_imageForBrush(int brushStyle, bool invert);
 
 ////////////////////////////////// Private Methods //////////////////////////////////////////
@@ -612,8 +616,6 @@ void QGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
     }
 
     if (newMode == TextDrawingMode) {
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinateArray.data());
-        setVertexAttributePointer(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinateArray.data());
         shaderManager->setHasComplexGeometry(true);
     } else {
         shaderManager->setHasComplexGeometry(false);
@@ -1444,7 +1446,7 @@ namespace {
     {
     public:
         QOpenGLStaticTextUserData()
-            : QStaticTextUserData(OpenGLUserData)
+            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0)
         {
         }
 
@@ -1452,6 +1454,7 @@ namespace {
         {
         }
 
+        QSize cacheSize;
         QGL2PEXVertexArray vertexCoordinateArray;
         QGL2PEXVertexArray textureCoordinateArray;
     };
@@ -1474,9 +1477,22 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
         staticTextItem->fontEngine->setGlyphCache(ctx, cache);
     }
 
-    cache->setPaintEnginePrivate(this);
-    cache->populate(staticTextItem->fontEngine, staticTextItem->numGlyphs, staticTextItem->glyphs,
-                    staticTextItem->glyphPositions);
+    bool recreateVertexArrays = false;
+    if (staticTextItem->userDataNeedsUpdate)
+        recreateVertexArrays = true;
+    else if (staticTextItem->userData == 0)
+        recreateVertexArrays = true;
+    else if (staticTextItem->userData->type != QStaticTextUserData::OpenGLUserData)
+        recreateVertexArrays = true;
+
+    // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
+    // If the cache size has changed, we do need to regenerate the vertices, but we don't need to repopulate the
+    // cache so this text is performed before we test if the cache size has changed.
+    if (recreateVertexArrays) {
+        cache->setPaintEnginePrivate(this);
+        cache->populate(staticTextItem->fontEngine, staticTextItem->numGlyphs, staticTextItem->glyphs,
+                        staticTextItem->glyphPositions);
+    }
 
     if (cache->width() == 0 || cache->height() == 0)
         return;
@@ -1488,14 +1504,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
     GLfloat dx = 1.0 / cache->width();
     GLfloat dy = 1.0 / cache->height();
 
-    bool recreateVertexArrays = false;
-    if (staticTextItem->userDataNeedsUpdate)
-        recreateVertexArrays = true;
-    else if (staticTextItem->userData == 0)
-        recreateVertexArrays = true;
-    else if (staticTextItem->userData->type != QStaticTextUserData::OpenGLUserData)
-        recreateVertexArrays = true;
-
     // Use global arrays by default
     QGL2PEXVertexArray *vertexCoordinates = &vertexCoordinateArray;
     QGL2PEXVertexArray *textureCoordinates = &textureCoordinateArray;
@@ -1516,6 +1524,12 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
         // Use cache if backend optimizations is turned on
         vertexCoordinates = &userData->vertexCoordinateArray;
         textureCoordinates = &userData->textureCoordinateArray;
+
+        QSize size(cache->width(), cache->height());
+        if (userData->cacheSize != size) {
+            recreateVertexArrays = true;
+            userData->cacheSize = size;
+        }
     }
 
 
@@ -1630,7 +1644,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
             glBindTexture(GL_TEXTURE_2D, cache->texture());
             updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, false);
 
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::MaskTexture), QT_MASK_TEXTURE_UNIT);
 #if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
             glDrawElements(GL_TRIANGLE_STRIP, 6 * staticTextItem->numGlyphs, GL_UNSIGNED_SHORT, 0);
 #else
@@ -1660,13 +1673,26 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
     }
     //### TODO: Gamma correction
 
-    glActiveTexture(GL_TEXTURE0 + QT_MASK_TEXTURE_UNIT);
-    if (lastMaskTextureUsed != cache->texture()) {
-        glBindTexture(GL_TEXTURE_2D, cache->texture());
-        lastMaskTextureUsed = cache->texture();
+    QGLTextureGlyphCache::FilterMode filterMode = (s->matrix.type() > QTransform::TxTranslate)?QGLTextureGlyphCache::Linear:QGLTextureGlyphCache::Nearest;
+    if (lastMaskTextureUsed != cache->texture() || cache->filterMode() != filterMode) {
+
+        glActiveTexture(GL_TEXTURE0 + QT_MASK_TEXTURE_UNIT);
+        if (lastMaskTextureUsed != cache->texture()) {
+            glBindTexture(GL_TEXTURE_2D, cache->texture());
+            lastMaskTextureUsed = cache->texture();
+        }
+
+        if (cache->filterMode() != filterMode) {
+            if (filterMode == QGLTextureGlyphCache::Linear) {
+                glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+            } else {
+                glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            }
+            cache->setFilterMode(filterMode);
+        }
     }
-    updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, s->matrix.type() > QTransform::TxTranslate);
-    shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::MaskTexture), QT_MASK_TEXTURE_UNIT);
 
 #if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
     glDrawElements(GL_TRIANGLE_STRIP, 6 * staticTextItem->numGlyphs, GL_UNSIGNED_SHORT, 0);
@@ -1846,6 +1872,9 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
 #if defined(Q_WS_WIN)
     if (qt_cleartype_enabled)
 #endif
+#if defined(Q_WS_MAC)
+    if (qt_applefontsmoothing_enabled)
+#endif
         d->glyphCacheType = QFontEngineGlyphCache::Raster_RGBMask;
 #endif
 
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index f353995..9a5bac0 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -57,6 +57,7 @@ QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyph
     , ctx(context)
     , m_width(0)
     , m_height(0)
+    , m_filterMode(Nearest)
 {
     // broken FBO readback is a bug in the SGX 1.3 and 1.4 drivers for the N900 where
     // copying between FBO's is broken if the texture is either GL_ALPHA or POT. The
@@ -114,6 +115,9 @@ void QGLTextureGlyphCache::createTextureData(int width, int height)
 
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    m_filterMode = Nearest;
 }
 
 void QGLTextureGlyphCache::resizeTextureData(int width, int height)
@@ -152,6 +156,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    m_filterMode = Nearest;
     glBindTexture(GL_TEXTURE_2D, 0);
     glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
                            GL_TEXTURE_2D, tmp_texture, 0);
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index eb3693c..e22146d 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -83,6 +83,12 @@ public:
 
     inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
 
+    enum FilterMode {
+        Nearest,
+        Linear
+    };
+    FilterMode filterMode() const { return m_filterMode; }
+    void setFilterMode(FilterMode m) { m_filterMode = m; }
 
 public Q_SLOTS:
     void contextDestroyed(const QGLContext *context) {
@@ -117,6 +123,8 @@ private:
     int m_height;
 
     QGLShaderProgram *m_program;
+
+    FilterMode m_filterMode;
 };
 
 QT_END_NAMESPACE
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index f417892..cf0398a 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -142,7 +142,7 @@ EXPORTS
 	?setEnumOrFlag@QMetaPropertyBuilder@@QAEX_N@Z @ 141 NONAME ; void QMetaPropertyBuilder::setEnumOrFlag(bool)
 	?getStaticMetaObject@QDeclarativeRectangle@@SAABUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const & QDeclarativeRectangle::getStaticMetaObject(void)
 	?isValid@QDeclarativeProperty@@QBE_NXZ @ 143 NONAME ; bool QDeclarativeProperty::isValid(void) const
-	?isConnected@QDeclarativeDebugClient@@QBE_NXZ @ 144 NONAME ; bool QDeclarativeDebugClient::isConnected(void) const
+	?isConnected@QDeclarativeDebugClient@@QBE_NXZ @ 144 NONAME ABSENT ; bool QDeclarativeDebugClient::isConnected(void) const
 	?enabled@QDeclarativeBinding@@QBE_NXZ @ 145 NONAME ; bool QDeclarativeBinding::enabled(void) const
 	?setSource@QDeclarativeView@@QAEXABVQUrl@@@Z @ 146 NONAME ; void QDeclarativeView::setSource(class QUrl const &)
 	??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
@@ -461,7 +461,7 @@ EXPORTS
 	?qt_metacall@QDeclarativeContext@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; int QDeclarativeContext::qt_metacall(enum QMetaObject::Call, int, void * *)
 	??_EQDeclarativeValueType@@UAE@I@Z @ 461 NONAME ; QDeclarativeValueType::~QDeclarativeValueType(unsigned int)
 	?qt_metacall@QDeclarativeState@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ; int QDeclarativeState::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?isEnabled@QDeclarativeDebugService@@QBE_NXZ @ 463 NONAME ; bool QDeclarativeDebugService::isEnabled(void) const
+	?isEnabled@QDeclarativeDebugService@@QBE_NXZ @ 463 NONAME ABSENT ; bool QDeclarativeDebugService::isEnabled(void) const
 	?stateChanged@QDeclarativeDebugWatch@@IAEXW4State@1@@Z @ 464 NONAME ; void QDeclarativeDebugWatch::stateChanged(enum QDeclarativeDebugWatch::State)
 	??0QMetaMethodBuilder@@AAE@PBVQMetaObjectBuilder@@H@Z @ 465 NONAME ; QMetaMethodBuilder::QMetaMethodBuilder(class QMetaObjectBuilder const *, int)
 	??4QDeclarativeListReference@@QAEAAV0@ABV0@@Z @ 466 NONAME ; class QDeclarativeListReference & QDeclarativeListReference::operator=(class QDeclarativeListReference const &)
@@ -1028,7 +1028,7 @@ EXPORTS
 	?qmlInfo@@YA?AVQDeclarativeInfo@@PBVQObject@@ABVQDeclarativeError@@@Z @ 1027 NONAME ; class QDeclarativeInfo qmlInfo(class QObject const *, class QDeclarativeError const &)
 	?staticMetaObject@QDeclarativeText@@2UQMetaObject@@B @ 1028 NONAME ; struct QMetaObject const QDeclarativeText::staticMetaObject
 	?color@QDeclarativeRectangle@@QBE?AVQColor@@XZ @ 1029 NONAME ; class QColor QDeclarativeRectangle::color(void) const
-	?isEnabled@QDeclarativeDebugClient@@QBE_NXZ @ 1030 NONAME ; bool QDeclarativeDebugClient::isEnabled(void) const
+	?isEnabled@QDeclarativeDebugClient@@QBE_NXZ @ 1030 NONAME ABSENT ; bool QDeclarativeDebugClient::isEnabled(void) const
 	?send@QPacketProtocol@@QAEXABVQPacket@@@Z @ 1031 NONAME ; void QPacketProtocol::send(class QPacket const &)
 	?width@QDeclarativePixmap@@QBEHXZ @ 1032 NONAME ; int QDeclarativePixmap::width(void) const
 	?error@QDeclarativeCustomParser@@IAEXABVQDeclarativeCustomParserNode@@ABVQString@@@Z @ 1033 NONAME ; void QDeclarativeCustomParser::error(class QDeclarativeCustomParserNode const &, class QString const &)
@@ -1147,7 +1147,7 @@ EXPORTS
 	?removeNotifySignal@QMetaPropertyBuilder@@QAEXXZ @ 1146 NONAME ; void QMetaPropertyBuilder::removeNotifySignal(void)
 	?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
 	?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 1148 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &)
-	?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ; void QDeclarativeDebugService::enabledChanged(bool)
+	?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ABSENT ; void QDeclarativeDebugService::enabledChanged(bool)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 1150 NONAME ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugObjectReference const &, class QObject *)
 	?asAST@Variant@QDeclarativeParser@@QBEPAVNode@AST@QDeclarativeJS@@XZ @ 1151 NONAME ; class QDeclarativeJS::AST::Node * QDeclarativeParser::Variant::asAST(void) const
 	?indexOfClassInfo@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1152 NONAME ; int QMetaObjectBuilder::indexOfClassInfo(class QByteArray const &)
@@ -1386,7 +1386,7 @@ EXPORTS
 	?qmlTypes@QDeclarativeMetaType@@SA?AV?$QList@PAVQDeclarativeType@@@@XZ @ 1385 NONAME ; class QList<class QDeclarativeType *> QDeclarativeMetaType::qmlTypes(void)
 	?valueTypeCoreIndex@QDeclarativePropertyPrivate@@SAHABVQDeclarativeProperty@@@Z @ 1386 NONAME ; int QDeclarativePropertyPrivate::valueTypeCoreIndex(class QDeclarativeProperty const &)
 	?writeEnumProperty@QDeclarativePropertyPrivate@@SA_NABVQMetaProperty@@HPAVQObject@@ABVQVariant@@H@Z @ 1387 NONAME ; bool QDeclarativePropertyPrivate::writeEnumProperty(class QMetaProperty const &, int, class QObject *, class QVariant const &, int)
-	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ; void QDeclarativeDebugClient::setEnabled(bool)
+	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ABSENT ; void QDeclarativeDebugClient::setEnabled(bool)
 	??1QMetaObjectBuilder@@UAE@XZ @ 1389 NONAME ; QMetaObjectBuilder::~QMetaObjectBuilder(void)
 	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 1390 NONAME ; class QString QDeclarativeStateOperation::tr(char const *, char const *)
 	?clear@QPacket@@QAEXXZ @ 1391 NONAME ; void QPacket::clear(void)
@@ -1715,89 +1715,127 @@ EXPORTS
 	??0QDeclarativeListModel@@AAE@PBV0@PAVQDeclarativeListModelWorkerAgent@@@Z @ 1714 NONAME ; QDeclarativeListModel::QDeclarativeListModel(class QDeclarativeListModel const *, class QDeclarativeListModelWorkerAgent *)
 	?inWorkerThread@QDeclarativeListModel@@ABE_NXZ @ 1715 NONAME ; bool QDeclarativeListModel::inWorkerThread(void) const
 	?canMove@QDeclarativeListModel@@ABE_NHHH@Z @ 1716 NONAME ; bool QDeclarativeListModel::canMove(int, int, int) const
-	?setLoops@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1717 NONAME ; void QDeclarativeAbstractAnimation::setLoops(int)
-	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1718 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *)
-	?staticMetaObject@QDeclarativeAbstractAnimation@@2UQMetaObject@@B @ 1719 NONAME ; struct QMetaObject const QDeclarativeAbstractAnimation::staticMetaObject
-	?setRunning@QDeclarativeTimer@@QAEX_N@Z @ 1720 NONAME ; void QDeclarativeTimer::setRunning(bool)
-	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1721 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *)
-	?qt_metacall@QDeclarativeTimer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1722 NONAME ; int QDeclarativeTimer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setPaused@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1723 NONAME ; void QDeclarativeAbstractAnimation::setPaused(bool)
-	?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 1724 NONAME ; void QDeclarativeTimer::setRepeating(bool)
-	?interval@QDeclarativeTimer@@QBEHXZ @ 1725 NONAME ; int QDeclarativeTimer::interval(void) const
-	?start@QDeclarativeTimer@@QAEXXZ @ 1726 NONAME ; void QDeclarativeTimer::start(void)
-	?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1727 NONAME ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
-	?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1728 NONAME ; void QDeclarativeAbstractAnimation::componentComplete(void)
-	?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1729 NONAME ; void QDeclarativeAbstractAnimation::runningChanged(bool)
-	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1730 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int)
-	?metaObject@QDeclarativeTimer@@UBEPBUQMetaObject@@XZ @ 1731 NONAME ; struct QMetaObject const * QDeclarativeTimer::metaObject(void) const
-	?setGroup@QDeclarativeAbstractAnimation@@QAEXPAVQDeclarativeAnimationGroup@@@Z @ 1732 NONAME ; void QDeclarativeAbstractAnimation::setGroup(class QDeclarativeAnimationGroup *)
-	?isRepeating@QDeclarativeTimer@@QBE_NXZ @ 1733 NONAME ; bool QDeclarativeTimer::isRepeating(void) const
-	?setTriggeredOnStart@QDeclarativeTimer@@QAEX_N@Z @ 1734 NONAME ; void QDeclarativeTimer::setTriggeredOnStart(bool)
-	?currentTime@QDeclarativeAbstractAnimation@@QAEHXZ @ 1735 NONAME ; int QDeclarativeAbstractAnimation::currentTime(void)
-	??1QDeclarativeAbstractAnimation@@UAE@XZ @ 1736 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(void)
-	?triggered@QDeclarativeTimer@@IAEXXZ @ 1737 NONAME ; void QDeclarativeTimer::triggered(void)
-	?finished@QDeclarativeTimer@@AAEXXZ @ 1738 NONAME ; void QDeclarativeTimer::finished(void)
-	?pausedChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1739 NONAME ; void QDeclarativeAbstractAnimation::pausedChanged(bool)
-	?complete@QDeclarativeAbstractAnimation@@QAEXXZ @ 1740 NONAME ; void QDeclarativeAbstractAnimation::complete(void)
-	?setRunning@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1741 NONAME ; void QDeclarativeAbstractAnimation::setRunning(bool)
-	?completed@QDeclarativeAbstractAnimation@@IAEXXZ @ 1742 NONAME ; void QDeclarativeAbstractAnimation::completed(void)
-	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1743 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *)
-	?loopCountChanged@QDeclarativeAbstractAnimation@@IAEXH@Z @ 1744 NONAME ; void QDeclarativeAbstractAnimation::loopCountChanged(int)
-	?repeatChanged@QDeclarativeTimer@@IAEXXZ @ 1745 NONAME ; void QDeclarativeTimer::repeatChanged(void)
-	?setDisableUserControl@QDeclarativeAbstractAnimation@@QAEXXZ @ 1746 NONAME ; void QDeclarativeAbstractAnimation::setDisableUserControl(void)
-	?setDefaultTarget@QDeclarativeAbstractAnimation@@QAEXABVQDeclarativeProperty@@@Z @ 1747 NONAME ; void QDeclarativeAbstractAnimation::setDefaultTarget(class QDeclarativeProperty const &)
-	?triggeredOnStart@QDeclarativeTimer@@QBE_NXZ @ 1748 NONAME ; bool QDeclarativeTimer::triggeredOnStart(void) const
-	?notifyRunningChanged@QDeclarativeAbstractAnimation@@AAEX_N@Z @ 1749 NONAME ; void QDeclarativeAbstractAnimation::notifyRunningChanged(bool)
-	?componentComplete@QDeclarativeTimer@@MAEXXZ @ 1750 NONAME ; void QDeclarativeTimer::componentComplete(void)
-	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1751 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *)
-	?isRunning@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1752 NONAME ; bool QDeclarativeAbstractAnimation::isRunning(void) const
-	?d_func@QDeclarativeAbstractAnimation@@ABEPBVQDeclarativeAbstractAnimationPrivate@@XZ @ 1753 NONAME ; class QDeclarativeAbstractAnimationPrivate const * QDeclarativeAbstractAnimation::d_func(void) const
-	??_EQDeclarativeAbstractAnimation@@UAE@I@Z @ 1754 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(unsigned int)
-	?d_func@QDeclarativeAbstractAnimation@@AAEPAVQDeclarativeAbstractAnimationPrivate@@XZ @ 1755 NONAME ; class QDeclarativeAbstractAnimationPrivate * QDeclarativeAbstractAnimation::d_func(void)
-	?componentFinalized@QDeclarativeAbstractAnimation@@AAEXXZ @ 1756 NONAME ; void QDeclarativeAbstractAnimation::componentFinalized(void)
-	??_EQDeclarativeTimer@@UAE@I@Z @ 1757 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(unsigned int)
-	?pause@QDeclarativeAbstractAnimation@@QAEXXZ @ 1758 NONAME ; void QDeclarativeAbstractAnimation::pause(void)
-	?stop@QDeclarativeTimer@@QAEXXZ @ 1759 NONAME ; void QDeclarativeTimer::stop(void)
-	?timelineComplete@QDeclarativeAbstractAnimation@@AAEXXZ @ 1760 NONAME ; void QDeclarativeAbstractAnimation::timelineComplete(void)
-	?setAlwaysRunToEnd@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1761 NONAME ; void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool)
-	?classBegin@QDeclarativeAbstractAnimation@@UAEXXZ @ 1762 NONAME ; void QDeclarativeAbstractAnimation::classBegin(void)
-	?d_func@QDeclarativeTimer@@AAEPAVQDeclarativeTimerPrivate@@XZ @ 1763 NONAME ; class QDeclarativeTimerPrivate * QDeclarativeTimer::d_func(void)
-	??0QDeclarativeAbstractAnimation@@QAE@PAVQObject@@@Z @ 1764 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QObject *)
-	?metaObject@QDeclarativeAbstractAnimation@@UBEPBUQMetaObject@@XZ @ 1765 NONAME ; struct QMetaObject const * QDeclarativeAbstractAnimation::metaObject(void) const
-	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1766 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *, int)
-	?started@QDeclarativeAbstractAnimation@@IAEXXZ @ 1767 NONAME ; void QDeclarativeAbstractAnimation::started(void)
-	?setInterval@QDeclarativeTimer@@QAEXH@Z @ 1768 NONAME ; void QDeclarativeTimer::setInterval(int)
-	?d_func@QDeclarativeTimer@@ABEPBVQDeclarativeTimerPrivate@@XZ @ 1769 NONAME ; class QDeclarativeTimerPrivate const * QDeclarativeTimer::d_func(void) const
-	?staticMetaObject@QDeclarativeTimer@@2UQMetaObject@@B @ 1770 NONAME ; struct QMetaObject const QDeclarativeTimer::staticMetaObject
-	?qt_metacast@QDeclarativeAbstractAnimation@@UAEPAXPBD@Z @ 1771 NONAME ; void * QDeclarativeAbstractAnimation::qt_metacast(char const *)
-	?setCurrentTime@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1772 NONAME ; void QDeclarativeAbstractAnimation::setCurrentTime(int)
-	?restart@QDeclarativeAbstractAnimation@@QAEXXZ @ 1773 NONAME ; void QDeclarativeAbstractAnimation::restart(void)
-	??0QDeclarativeAbstractAnimation@@IAE@AAVQDeclarativeAbstractAnimationPrivate@@PAVQObject@@@Z @ 1774 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QDeclarativeAbstractAnimationPrivate &, class QObject *)
-	?resume@QDeclarativeAbstractAnimation@@QAEXXZ @ 1775 NONAME ; void QDeclarativeAbstractAnimation::resume(void)
-	?runningChanged@QDeclarativeTimer@@IAEXXZ @ 1776 NONAME ; void QDeclarativeTimer::runningChanged(void)
-	?ticked@QDeclarativeTimer@@AAEXXZ @ 1777 NONAME ; void QDeclarativeTimer::ticked(void)
-	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1778 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *, int)
-	??0QDeclarativeTimer@@QAE@PAVQObject@@@Z @ 1779 NONAME ; QDeclarativeTimer::QDeclarativeTimer(class QObject *)
-	?loops@QDeclarativeAbstractAnimation@@QBEHXZ @ 1780 NONAME ; int QDeclarativeAbstractAnimation::loops(void) const
-	?setTarget@QDeclarativeAbstractAnimation@@EAEXABVQDeclarativeProperty@@@Z @ 1781 NONAME ; void QDeclarativeAbstractAnimation::setTarget(class QDeclarativeProperty const &)
-	?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1782 NONAME ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const
-	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1783 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *, int)
-	?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1784 NONAME ; void QDeclarativeTimer::intervalChanged(void)
-	?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1785 NONAME ; bool QDeclarativeAbstractAnimation::isPaused(void) const
-	?getStaticMetaObject@QDeclarativeAbstractAnimation@@SAABUQMetaObject@@XZ @ 1786 NONAME ; struct QMetaObject const & QDeclarativeAbstractAnimation::getStaticMetaObject(void)
-	?group@QDeclarativeAbstractAnimation@@QBEPAVQDeclarativeAnimationGroup@@XZ @ 1787 NONAME ; class QDeclarativeAnimationGroup * QDeclarativeAbstractAnimation::group(void) const
-	?classBegin@QDeclarativeTimer@@MAEXXZ @ 1788 NONAME ; void QDeclarativeTimer::classBegin(void)
-	?restart@QDeclarativeTimer@@QAEXXZ @ 1789 NONAME ; void QDeclarativeTimer::restart(void)
-	??1QDeclarativeTimer@@UAE@XZ @ 1790 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(void)
-	?getStaticMetaObject@QDeclarativeTimer@@SAABUQMetaObject@@XZ @ 1791 NONAME ; struct QMetaObject const & QDeclarativeTimer::getStaticMetaObject(void)
-	?qt_metacast@QDeclarativeTimer@@UAEPAXPBD@Z @ 1792 NONAME ; void * QDeclarativeTimer::qt_metacast(char const *)
-	?alwaysRunToEndChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1793 NONAME ; void QDeclarativeAbstractAnimation::alwaysRunToEndChanged(bool)
-	?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 1794 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void)
-	?isRunning@QDeclarativeTimer@@QBE_NXZ @ 1795 NONAME ; bool QDeclarativeTimer::isRunning(void) const
-	?update@QDeclarativeTimer@@AAEXXZ @ 1796 NONAME ; void QDeclarativeTimer::update(void)
-	?stop@QDeclarativeAbstractAnimation@@QAEXXZ @ 1797 NONAME ; void QDeclarativeAbstractAnimation::stop(void)
-	?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1798 NONAME ; void QDeclarativeAbstractAnimation::start(void)
-	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1799 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?getScriptEngine@QDeclarativeDebugHelper@@SAPAVQScriptEngine@@PAVQDeclarativeEngine@@@Z @ 1800 NONAME ; class QScriptEngine * QDeclarativeDebugHelper::getScriptEngine(class QDeclarativeEngine *)
-	?setAnimationSlowDownFactor@QDeclarativeDebugHelper@@SAXM@Z @ 1801 NONAME ; void QDeclarativeDebugHelper::setAnimationSlowDownFactor(float)
+	?getScriptEngine@QDeclarativeDebugHelper@@SAPAVQScriptEngine@@PAVQDeclarativeEngine@@@Z @ 1717 NONAME ; class QScriptEngine * QDeclarativeDebugHelper::getScriptEngine(class QDeclarativeEngine *)
+	?setAnimationSlowDownFactor@QDeclarativeDebugHelper@@SAXM@Z @ 1718 NONAME ; void QDeclarativeDebugHelper::setAnimationSlowDownFactor(float)
+	?add@QDeclarativeBasePositioner@@QBEPAVQDeclarativeTransition@@XZ @ 1719 NONAME ; class QDeclarativeTransition * QDeclarativeBasePositioner::add(void) const
+	?setLoops@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1720 NONAME ; void QDeclarativeAbstractAnimation::setLoops(int)
+	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1721 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *)
+	?tr@QDeclarativeBasePositioner@@SA?AVQString@@PBD0@Z @ 1722 NONAME ; class QString QDeclarativeBasePositioner::tr(char const *, char const *)
+	?staticMetaObject@QDeclarativeAbstractAnimation@@2UQMetaObject@@B @ 1723 NONAME ; struct QMetaObject const QDeclarativeAbstractAnimation::staticMetaObject
+	?setMove@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 1724 NONAME ; void QDeclarativeBasePositioner::setMove(class QDeclarativeTransition *)
+	?setRunning@QDeclarativeTimer@@QAEX_N@Z @ 1725 NONAME ; void QDeclarativeTimer::setRunning(bool)
+	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1726 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *)
+	?qt_metacall@QDeclarativeTimer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1727 NONAME ; int QDeclarativeTimer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setPaused@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1728 NONAME ; void QDeclarativeAbstractAnimation::setPaused(bool)
+	?d_func@QDeclarativeBasePositioner@@ABEPBVQDeclarativeBasePositionerPrivate@@XZ @ 1729 NONAME ; class QDeclarativeBasePositionerPrivate const * QDeclarativeBasePositioner::d_func(void) const
+	?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 1730 NONAME ; void QDeclarativeTimer::setRepeating(bool)
+	?interval@QDeclarativeTimer@@QBEHXZ @ 1731 NONAME ; int QDeclarativeTimer::interval(void) const
+	?start@QDeclarativeTimer@@QAEXXZ @ 1732 NONAME ; void QDeclarativeTimer::start(void)
+	?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1733 NONAME ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
+	?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1734 NONAME ; void QDeclarativeAbstractAnimation::componentComplete(void)
+	?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
+	?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1736 NONAME ; void QDeclarativeAbstractAnimation::runningChanged(bool)
+	?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1737 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int)
+	??_EQDeclarativeBasePositioner@@UAE@I@Z @ 1738 NONAME ; QDeclarativeBasePositioner::~QDeclarativeBasePositioner(unsigned int)
+	?metaObject@QDeclarativeTimer@@UBEPBUQMetaObject@@XZ @ 1739 NONAME ; struct QMetaObject const * QDeclarativeTimer::metaObject(void) const
+	?setGroup@QDeclarativeAbstractAnimation@@QAEXPAVQDeclarativeAnimationGroup@@@Z @ 1740 NONAME ; void QDeclarativeAbstractAnimation::setGroup(class QDeclarativeAnimationGroup *)
+	?isRepeating@QDeclarativeTimer@@QBE_NXZ @ 1741 NONAME ; bool QDeclarativeTimer::isRepeating(void) const
+	?setTriggeredOnStart@QDeclarativeTimer@@QAEX_N@Z @ 1742 NONAME ; void QDeclarativeTimer::setTriggeredOnStart(bool)
+	?currentTime@QDeclarativeAbstractAnimation@@QAEHXZ @ 1743 NONAME ; int QDeclarativeAbstractAnimation::currentTime(void)
+	?status@QDeclarativeEngineDebug@@QBE?AW4Status@1@XZ @ 1744 NONAME ; enum QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status(void) const
+	??1QDeclarativeAbstractAnimation@@UAE@XZ @ 1745 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(void)
+	?triggered@QDeclarativeTimer@@IAEXXZ @ 1746 NONAME ; void QDeclarativeTimer::triggered(void)
+	?getStaticMetaObject@QDeclarativeBasePositioner@@SAABUQMetaObject@@XZ @ 1747 NONAME ; struct QMetaObject const & QDeclarativeBasePositioner::getStaticMetaObject(void)
+	?finished@QDeclarativeTimer@@AAEXXZ @ 1748 NONAME ; void QDeclarativeTimer::finished(void)
+	?pausedChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1749 NONAME ; void QDeclarativeAbstractAnimation::pausedChanged(bool)
+	?complete@QDeclarativeAbstractAnimation@@QAEXXZ @ 1750 NONAME ; void QDeclarativeAbstractAnimation::complete(void)
+	?setRunning@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1751 NONAME ; void QDeclarativeAbstractAnimation::setRunning(bool)
+	?trUtf8@QDeclarativeBasePositioner@@SA?AVQString@@PBD0H@Z @ 1752 NONAME ; class QString QDeclarativeBasePositioner::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeBasePositioner@@SA?AVQString@@PBD0@Z @ 1753 NONAME ; class QString QDeclarativeBasePositioner::trUtf8(char const *, char const *)
+	?completed@QDeclarativeAbstractAnimation@@IAEXXZ @ 1754 NONAME ; void QDeclarativeAbstractAnimation::completed(void)
+	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1755 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *)
+	?loopCountChanged@QDeclarativeAbstractAnimation@@IAEXH@Z @ 1756 NONAME ; void QDeclarativeAbstractAnimation::loopCountChanged(int)
+	?repeatChanged@QDeclarativeTimer@@IAEXXZ @ 1757 NONAME ; void QDeclarativeTimer::repeatChanged(void)
+	?setDisableUserControl@QDeclarativeAbstractAnimation@@QAEXXZ @ 1758 NONAME ; void QDeclarativeAbstractAnimation::setDisableUserControl(void)
+	?componentComplete@QDeclarativeBasePositioner@@MAEXXZ @ 1759 NONAME ; void QDeclarativeBasePositioner::componentComplete(void)
+	?setDefaultTarget@QDeclarativeAbstractAnimation@@QAEXABVQDeclarativeProperty@@@Z @ 1760 NONAME ; void QDeclarativeAbstractAnimation::setDefaultTarget(class QDeclarativeProperty const &)
+	?staticMetaObject@QDeclarativeBasePositioner@@2UQMetaObject@@B @ 1761 NONAME ; struct QMetaObject const QDeclarativeBasePositioner::staticMetaObject
+	?triggeredOnStart@QDeclarativeTimer@@QBE_NXZ @ 1762 NONAME ; bool QDeclarativeTimer::triggeredOnStart(void) const
+	?notifyRunningChanged@QDeclarativeAbstractAnimation@@AAEX_N@Z @ 1763 NONAME ; void QDeclarativeAbstractAnimation::notifyRunningChanged(bool)
+	?statusChanged@QDeclarativeDebugClient@@MAEXW4Status@1@@Z @ 1764 NONAME ; void QDeclarativeDebugClient::statusChanged(enum QDeclarativeDebugClient::Status)
+	??0QDeclarativeBasePositioner@@IAE@AAVQDeclarativeBasePositionerPrivate@@W4PositionerType@0@PAVQDeclarativeItem@@@Z @ 1765 NONAME ; QDeclarativeBasePositioner::QDeclarativeBasePositioner(class QDeclarativeBasePositionerPrivate &, enum QDeclarativeBasePositioner::PositionerType, class QDeclarativeItem *)
+	?componentComplete@QDeclarativeTimer@@MAEXXZ @ 1766 NONAME ; void QDeclarativeTimer::componentComplete(void)
+	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1767 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *)
+	?isRunning@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1768 NONAME ; bool QDeclarativeAbstractAnimation::isRunning(void) const
+	?d_func@QDeclarativeAbstractAnimation@@ABEPBVQDeclarativeAbstractAnimationPrivate@@XZ @ 1769 NONAME ; class QDeclarativeAbstractAnimationPrivate const * QDeclarativeAbstractAnimation::d_func(void) const
+	??_EQDeclarativeAbstractAnimation@@UAE@I@Z @ 1770 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(unsigned int)
+	??0QDeclarativeBasePositioner@@QAE@W4PositionerType@0@PAVQDeclarativeItem@@@Z @ 1771 NONAME ; QDeclarativeBasePositioner::QDeclarativeBasePositioner(enum QDeclarativeBasePositioner::PositionerType, class QDeclarativeItem *)
+	?qt_metacall@QDeclarativeBasePositioner@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1772 NONAME ; int QDeclarativeBasePositioner::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?status@QDeclarativeDebugClient@@QBE?AW4Status@1@XZ @ 1773 NONAME ; enum QDeclarativeDebugClient::Status QDeclarativeDebugClient::status(void) const
+	?prePositioning@QDeclarativeBasePositioner@@IAEXXZ @ 1774 NONAME ; void QDeclarativeBasePositioner::prePositioning(void)
+	?finishApplyTransitions@QDeclarativeBasePositioner@@IAEXXZ @ 1775 NONAME ; void QDeclarativeBasePositioner::finishApplyTransitions(void)
+	?d_func@QDeclarativeAbstractAnimation@@AAEPAVQDeclarativeAbstractAnimationPrivate@@XZ @ 1776 NONAME ; class QDeclarativeAbstractAnimationPrivate * QDeclarativeAbstractAnimation::d_func(void)
+	?componentFinalized@QDeclarativeAbstractAnimation@@AAEXXZ @ 1777 NONAME ; void QDeclarativeAbstractAnimation::componentFinalized(void)
+	??_EQDeclarativeTimer@@UAE@I@Z @ 1778 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(unsigned int)
+	?pause@QDeclarativeAbstractAnimation@@QAEXXZ @ 1779 NONAME ; void QDeclarativeAbstractAnimation::pause(void)
+	?stop@QDeclarativeTimer@@QAEXXZ @ 1780 NONAME ; void QDeclarativeTimer::stop(void)
+	?timelineComplete@QDeclarativeAbstractAnimation@@AAEXXZ @ 1781 NONAME ; void QDeclarativeAbstractAnimation::timelineComplete(void)
+	?d_func@QDeclarativeBasePositioner@@AAEPAVQDeclarativeBasePositionerPrivate@@XZ @ 1782 NONAME ; class QDeclarativeBasePositionerPrivate * QDeclarativeBasePositioner::d_func(void)
+	?setAlwaysRunToEnd@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1783 NONAME ; void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool)
+	?classBegin@QDeclarativeAbstractAnimation@@UAEXXZ @ 1784 NONAME ; void QDeclarativeAbstractAnimation::classBegin(void)
+	?d_func@QDeclarativeTimer@@AAEPAVQDeclarativeTimerPrivate@@XZ @ 1785 NONAME ; class QDeclarativeTimerPrivate * QDeclarativeTimer::d_func(void)
+	?spacing@QDeclarativeBasePositioner@@QBEHXZ @ 1786 NONAME ; int QDeclarativeBasePositioner::spacing(void) const
+	??0QDeclarativeAbstractAnimation@@QAE@PAVQObject@@@Z @ 1787 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QObject *)
+	?metaObject@QDeclarativeAbstractAnimation@@UBEPBUQMetaObject@@XZ @ 1788 NONAME ; struct QMetaObject const * QDeclarativeAbstractAnimation::metaObject(void) const
+	?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1789 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *, int)
+	?started@QDeclarativeAbstractAnimation@@IAEXXZ @ 1790 NONAME ; void QDeclarativeAbstractAnimation::started(void)
+	?setInterval@QDeclarativeTimer@@QAEXH@Z @ 1791 NONAME ; void QDeclarativeTimer::setInterval(int)
+	?statusChanged@QDeclarativeEngineDebug@@IAEXW4Status@1@@Z @ 1792 NONAME ; void QDeclarativeEngineDebug::statusChanged(enum QDeclarativeEngineDebug::Status)
+	?d_func@QDeclarativeTimer@@ABEPBVQDeclarativeTimerPrivate@@XZ @ 1793 NONAME ; class QDeclarativeTimerPrivate const * QDeclarativeTimer::d_func(void) const
+	?setSpacing@QDeclarativeBasePositioner@@QAEXH@Z @ 1794 NONAME ; void QDeclarativeBasePositioner::setSpacing(int)
+	?staticMetaObject@QDeclarativeTimer@@2UQMetaObject@@B @ 1795 NONAME ; struct QMetaObject const QDeclarativeTimer::staticMetaObject
+	?positionY@QDeclarativeBasePositioner@@IAEXHABVPositionedItem@1@@Z @ 1796 NONAME ; void QDeclarativeBasePositioner::positionY(int, class QDeclarativeBasePositioner::PositionedItem const &)
+	?qt_metacast@QDeclarativeAbstractAnimation@@UAEPAXPBD@Z @ 1797 NONAME ; void * QDeclarativeAbstractAnimation::qt_metacast(char const *)
+	?setAdd@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 1798 NONAME ; void QDeclarativeBasePositioner::setAdd(class QDeclarativeTransition *)
+	?setCurrentTime@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1799 NONAME ; void QDeclarativeAbstractAnimation::setCurrentTime(int)
+	?attachedPropertiesId@QDeclarativeType@@QBEHXZ @ 1800 NONAME ; int QDeclarativeType::attachedPropertiesId(void) const
+	?positionX@QDeclarativeBasePositioner@@IAEXHABVPositionedItem@1@@Z @ 1801 NONAME ; void QDeclarativeBasePositioner::positionX(int, class QDeclarativeBasePositioner::PositionedItem const &)
+	?restart@QDeclarativeAbstractAnimation@@QAEXXZ @ 1802 NONAME ; void QDeclarativeAbstractAnimation::restart(void)
+	?itemChange@QDeclarativeBasePositioner@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1803 NONAME ; class QVariant QDeclarativeBasePositioner::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
+	??0QDeclarativeAbstractAnimation@@IAE@AAVQDeclarativeAbstractAnimationPrivate@@PAVQObject@@@Z @ 1804 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QDeclarativeAbstractAnimationPrivate &, class QObject *)
+	?resume@QDeclarativeAbstractAnimation@@QAEXXZ @ 1805 NONAME ; void QDeclarativeAbstractAnimation::resume(void)
+	?runningChanged@QDeclarativeTimer@@IAEXXZ @ 1806 NONAME ; void QDeclarativeTimer::runningChanged(void)
+	?ticked@QDeclarativeTimer@@AAEXXZ @ 1807 NONAME ; void QDeclarativeTimer::ticked(void)
+	?graphicsWidgetGeometryChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1808 NONAME ; void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged(void)
+	?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1809 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *, int)
+	??0QDeclarativeTimer@@QAE@PAVQObject@@@Z @ 1810 NONAME ; QDeclarativeTimer::QDeclarativeTimer(class QObject *)
+	?loops@QDeclarativeAbstractAnimation@@QBEHXZ @ 1811 NONAME ; int QDeclarativeAbstractAnimation::loops(void) const
+	?setTarget@QDeclarativeAbstractAnimation@@EAEXABVQDeclarativeProperty@@@Z @ 1812 NONAME ; void QDeclarativeAbstractAnimation::setTarget(class QDeclarativeProperty const &)
+	?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1813 NONAME ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const
+	?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1814 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *, int)
+	?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
+	?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1816 NONAME ; void QDeclarativeTimer::intervalChanged(void)
+	?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1817 NONAME ; bool QDeclarativeAbstractAnimation::isPaused(void) const
+	?getStaticMetaObject@QDeclarativeAbstractAnimation@@SAABUQMetaObject@@XZ @ 1818 NONAME ; struct QMetaObject const & QDeclarativeAbstractAnimation::getStaticMetaObject(void)
+	?group@QDeclarativeAbstractAnimation@@QBEPAVQDeclarativeAnimationGroup@@XZ @ 1819 NONAME ; class QDeclarativeAnimationGroup * QDeclarativeAbstractAnimation::group(void) const
+	?classBegin@QDeclarativeTimer@@MAEXXZ @ 1820 NONAME ; void QDeclarativeTimer::classBegin(void)
+	?restart@QDeclarativeTimer@@QAEXXZ @ 1821 NONAME ; void QDeclarativeTimer::restart(void)
+	?move@QDeclarativeBasePositioner@@QBEPAVQDeclarativeTransition@@XZ @ 1822 NONAME ; class QDeclarativeTransition * QDeclarativeBasePositioner::move(void) const
+	?spacingChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1823 NONAME ; void QDeclarativeBasePositioner::spacingChanged(void)
+	?qt_metacast@QDeclarativeBasePositioner@@UAEPAXPBD@Z @ 1824 NONAME ; void * QDeclarativeBasePositioner::qt_metacast(char const *)
+	??1QDeclarativeTimer@@UAE@XZ @ 1825 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(void)
+	?getStaticMetaObject@QDeclarativeTimer@@SAABUQMetaObject@@XZ @ 1826 NONAME ; struct QMetaObject const & QDeclarativeTimer::getStaticMetaObject(void)
+	?tr@QDeclarativeBasePositioner@@SA?AVQString@@PBD0H@Z @ 1827 NONAME ; class QString QDeclarativeBasePositioner::tr(char const *, char const *, int)
+	??1QDeclarativeBasePositioner@@UAE@XZ @ 1828 NONAME ; QDeclarativeBasePositioner::~QDeclarativeBasePositioner(void)
+	?moveChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1829 NONAME ; void QDeclarativeBasePositioner::moveChanged(void)
+	?qt_metacast@QDeclarativeTimer@@UAEPAXPBD@Z @ 1830 NONAME ; void * QDeclarativeTimer::qt_metacast(char const *)
+	?metaObject@QDeclarativeBasePositioner@@UBEPBUQMetaObject@@XZ @ 1831 NONAME ; struct QMetaObject const * QDeclarativeBasePositioner::metaObject(void) const
+	?alwaysRunToEndChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1832 NONAME ; void QDeclarativeAbstractAnimation::alwaysRunToEndChanged(bool)
+	?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 1833 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void)
+	?isRunning@QDeclarativeTimer@@QBE_NXZ @ 1834 NONAME ; bool QDeclarativeTimer::isRunning(void) const
+	?update@QDeclarativeTimer@@AAEXXZ @ 1835 NONAME ; void QDeclarativeTimer::update(void)
+	?stop@QDeclarativeAbstractAnimation@@QAEXXZ @ 1836 NONAME ; void QDeclarativeAbstractAnimation::stop(void)
+	?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ; void QDeclarativeBasePositioner::addChanged(void)
+	?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ; void QDeclarativeAbstractAnimation::start(void)
+	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index c4cd9b6..d4084cc 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -673,7 +673,7 @@ EXPORTS
 	_ZN22QDeclarativeTransitionD0Ev @ 672 NONAME
 	_ZN22QDeclarativeTransitionD1Ev @ 673 NONAME
 	_ZN22QDeclarativeTransitionD2Ev @ 674 NONAME
-	_ZN23QDeclarativeDebugClient10setEnabledEb @ 675 NONAME
+	_ZN23QDeclarativeDebugClient10setEnabledEb @ 675 NONAME ABSENT
 	_ZN23QDeclarativeDebugClient11qt_metacallEN11QMetaObject4CallEiPPv @ 676 NONAME
 	_ZN23QDeclarativeDebugClient11qt_metacastEPKc @ 677 NONAME
 	_ZN23QDeclarativeDebugClient11sendMessageERK10QByteArray @ 678 NONAME
@@ -766,7 +766,7 @@ EXPORTS
 	_ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME
 	_ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME
 	_ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME
-	_ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME
+	_ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME ABSENT
 	_ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME
 	_ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME
 	_ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16
@@ -1390,9 +1390,9 @@ EXPORTS
 	_ZNK22QDeclarativeTransition7toStateEv @ 1389 NONAME
 	_ZNK22QDeclarativeTransition9fromStateEv @ 1390 NONAME
 	_ZNK23QDeclarativeDebugClient10metaObjectEv @ 1391 NONAME
-	_ZNK23QDeclarativeDebugClient11isConnectedEv @ 1392 NONAME
+	_ZNK23QDeclarativeDebugClient11isConnectedEv @ 1392 NONAME ABSENT
 	_ZNK23QDeclarativeDebugClient4nameEv @ 1393 NONAME
-	_ZNK23QDeclarativeDebugClient9isEnabledEv @ 1394 NONAME
+	_ZNK23QDeclarativeDebugClient9isEnabledEv @ 1394 NONAME ABSENT
 	_ZNK23QDeclarativeDomDocument10rootObjectEv @ 1395 NONAME
 	_ZNK23QDeclarativeDomDocument6errorsEv @ 1396 NONAME
 	_ZNK23QDeclarativeDomDocument7importsEv @ 1397 NONAME
@@ -1427,7 +1427,7 @@ EXPORTS
 	_ZNK24QDeclarativeCustomParser12evaluateEnumERK10QByteArray @ 1426 NONAME
 	_ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME
 	_ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME
-	_ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME
+	_ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME ABSENT
 	_ZNK24QDeclarativeDomComponent13componentRootEv @ 1430 NONAME
 	_ZNK24QDeclarativeScriptString11scopeObjectEv @ 1431 NONAME
 	_ZNK24QDeclarativeScriptString6scriptEv @ 1432 NONAME
@@ -1747,90 +1747,140 @@ EXPORTS
 	_ZN21QDeclarativeListModelC1EPKS_P32QDeclarativeListModelWorkerAgent @ 1746 NONAME
 	_ZN21QDeclarativeListModelC2EPKS_P32QDeclarativeListModelWorkerAgent @ 1747 NONAME
 	_ZNK21QDeclarativeListModel14inWorkerThreadEv @ 1748 NONAME
-	_ZN17QDeclarativeTimer10classBeginEv @ 1749 NONAME
-	_ZN17QDeclarativeTimer10setRunningEb @ 1750 NONAME
-	_ZN17QDeclarativeTimer11qt_metacallEN11QMetaObject4CallEiPPv @ 1751 NONAME
-	_ZN17QDeclarativeTimer11qt_metacastEPKc @ 1752 NONAME
-	_ZN17QDeclarativeTimer11setIntervalEi @ 1753 NONAME
-	_ZN17QDeclarativeTimer12setRepeatingEb @ 1754 NONAME
-	_ZN17QDeclarativeTimer13repeatChangedEv @ 1755 NONAME
-	_ZN17QDeclarativeTimer14runningChangedEv @ 1756 NONAME
-	_ZN17QDeclarativeTimer15intervalChangedEv @ 1757 NONAME
-	_ZN17QDeclarativeTimer16staticMetaObjectE @ 1758 NONAME DATA 16
-	_ZN17QDeclarativeTimer17componentCompleteEv @ 1759 NONAME
-	_ZN17QDeclarativeTimer19getStaticMetaObjectEv @ 1760 NONAME
-	_ZN17QDeclarativeTimer19setTriggeredOnStartEb @ 1761 NONAME
-	_ZN17QDeclarativeTimer23triggeredOnStartChangedEv @ 1762 NONAME
-	_ZN17QDeclarativeTimer4stopEv @ 1763 NONAME
-	_ZN17QDeclarativeTimer5startEv @ 1764 NONAME
-	_ZN17QDeclarativeTimer6tickedEv @ 1765 NONAME
-	_ZN17QDeclarativeTimer6updateEv @ 1766 NONAME
-	_ZN17QDeclarativeTimer7restartEv @ 1767 NONAME
-	_ZN17QDeclarativeTimer8finishedEv @ 1768 NONAME
-	_ZN17QDeclarativeTimer9triggeredEv @ 1769 NONAME
-	_ZN17QDeclarativeTimerC1EP7QObject @ 1770 NONAME
-	_ZN17QDeclarativeTimerC2EP7QObject @ 1771 NONAME
-	_ZN29QDeclarativeAbstractAnimation10classBeginEv @ 1772 NONAME
-	_ZN29QDeclarativeAbstractAnimation10setRunningEb @ 1773 NONAME
-	_ZN29QDeclarativeAbstractAnimation10transitionER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyENS_19TransitionDirectionE @ 1774 NONAME
-	_ZN29QDeclarativeAbstractAnimation11currentTimeEv @ 1775 NONAME
-	_ZN29QDeclarativeAbstractAnimation11qt_metacallEN11QMetaObject4CallEiPPv @ 1776 NONAME
-	_ZN29QDeclarativeAbstractAnimation11qt_metacastEPKc @ 1777 NONAME
-	_ZN29QDeclarativeAbstractAnimation13pausedChangedEb @ 1778 NONAME
-	_ZN29QDeclarativeAbstractAnimation14runningChangedEb @ 1779 NONAME
-	_ZN29QDeclarativeAbstractAnimation14setCurrentTimeEi @ 1780 NONAME
-	_ZN29QDeclarativeAbstractAnimation16loopCountChangedEi @ 1781 NONAME
-	_ZN29QDeclarativeAbstractAnimation16setDefaultTargetERK20QDeclarativeProperty @ 1782 NONAME
-	_ZN29QDeclarativeAbstractAnimation16staticMetaObjectE @ 1783 NONAME DATA 16
-	_ZN29QDeclarativeAbstractAnimation16timelineCompleteEv @ 1784 NONAME
-	_ZN29QDeclarativeAbstractAnimation17componentCompleteEv @ 1785 NONAME
-	_ZN29QDeclarativeAbstractAnimation17setAlwaysRunToEndEb @ 1786 NONAME
-	_ZN29QDeclarativeAbstractAnimation18componentFinalizedEv @ 1787 NONAME
-	_ZN29QDeclarativeAbstractAnimation19getStaticMetaObjectEv @ 1788 NONAME
-	_ZN29QDeclarativeAbstractAnimation20notifyRunningChangedEb @ 1789 NONAME
-	_ZN29QDeclarativeAbstractAnimation21alwaysRunToEndChangedEb @ 1790 NONAME
-	_ZN29QDeclarativeAbstractAnimation21setDisableUserControlEv @ 1791 NONAME
-	_ZN29QDeclarativeAbstractAnimation4stopEv @ 1792 NONAME
-	_ZN29QDeclarativeAbstractAnimation5pauseEv @ 1793 NONAME
-	_ZN29QDeclarativeAbstractAnimation5startEv @ 1794 NONAME
-	_ZN29QDeclarativeAbstractAnimation6resumeEv @ 1795 NONAME
-	_ZN29QDeclarativeAbstractAnimation7restartEv @ 1796 NONAME
-	_ZN29QDeclarativeAbstractAnimation7startedEv @ 1797 NONAME
-	_ZN29QDeclarativeAbstractAnimation8completeEv @ 1798 NONAME
-	_ZN29QDeclarativeAbstractAnimation8setGroupEP26QDeclarativeAnimationGroup @ 1799 NONAME
-	_ZN29QDeclarativeAbstractAnimation8setLoopsEi @ 1800 NONAME
-	_ZN29QDeclarativeAbstractAnimation9completedEv @ 1801 NONAME
-	_ZN29QDeclarativeAbstractAnimation9setPausedEb @ 1802 NONAME
-	_ZN29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1803 NONAME
-	_ZN29QDeclarativeAbstractAnimationC2EP7QObject @ 1804 NONAME
-	_ZN29QDeclarativeAbstractAnimationC2ER36QDeclarativeAbstractAnimationPrivateP7QObject @ 1805 NONAME
-	_ZN29QDeclarativeAbstractAnimationD0Ev @ 1806 NONAME
-	_ZN29QDeclarativeAbstractAnimationD1Ev @ 1807 NONAME
-	_ZN29QDeclarativeAbstractAnimationD2Ev @ 1808 NONAME
-	_ZNK17QDeclarativeTimer10metaObjectEv @ 1809 NONAME
-	_ZNK17QDeclarativeTimer11isRepeatingEv @ 1810 NONAME
-	_ZNK17QDeclarativeTimer16triggeredOnStartEv @ 1811 NONAME
-	_ZNK17QDeclarativeTimer8intervalEv @ 1812 NONAME
-	_ZNK17QDeclarativeTimer9isRunningEv @ 1813 NONAME
-	_ZNK29QDeclarativeAbstractAnimation10metaObjectEv @ 1814 NONAME
-	_ZNK29QDeclarativeAbstractAnimation14alwaysRunToEndEv @ 1815 NONAME
-	_ZNK29QDeclarativeAbstractAnimation5groupEv @ 1816 NONAME
-	_ZNK29QDeclarativeAbstractAnimation5loopsEv @ 1817 NONAME
-	_ZNK29QDeclarativeAbstractAnimation8isPausedEv @ 1818 NONAME
-	_ZNK29QDeclarativeAbstractAnimation9isRunningEv @ 1819 NONAME
-	_ZTI17QDeclarativeTimer @ 1820 NONAME
-	_ZTI29QDeclarativeAbstractAnimation @ 1821 NONAME
-	_ZTV17QDeclarativeTimer @ 1822 NONAME
-	_ZTV29QDeclarativeAbstractAnimation @ 1823 NONAME
-	_ZThn12_N29QDeclarativeAbstractAnimation10classBeginEv @ 1824 NONAME
-	_ZThn12_N29QDeclarativeAbstractAnimation17componentCompleteEv @ 1825 NONAME
-	_ZThn12_N29QDeclarativeAbstractAnimationD0Ev @ 1826 NONAME
-	_ZThn12_N29QDeclarativeAbstractAnimationD1Ev @ 1827 NONAME
-	_ZThn8_N17QDeclarativeTimer10classBeginEv @ 1828 NONAME
-	_ZThn8_N17QDeclarativeTimer17componentCompleteEv @ 1829 NONAME
-	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1830 NONAME
-	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1831 NONAME
-	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1832 NONAME
-	_ZN23QDeclarativeDebugHelper15getScriptEngineEP18QDeclarativeEngine @ 1833 NONAME
-	_ZN23QDeclarativeDebugHelper26setAnimationSlowDownFactorEf @ 1834 NONAME
+	_ZN23QDeclarativeDebugHelper15getScriptEngineEP18QDeclarativeEngine @ 1749 NONAME
+	_ZN23QDeclarativeDebugHelper26setAnimationSlowDownFactorEf @ 1750 NONAME
+	_ZN17QDeclarativeTimer10classBeginEv @ 1751 NONAME
+	_ZN17QDeclarativeTimer10setRunningEb @ 1752 NONAME
+	_ZN17QDeclarativeTimer11qt_metacallEN11QMetaObject4CallEiPPv @ 1753 NONAME
+	_ZN17QDeclarativeTimer11qt_metacastEPKc @ 1754 NONAME
+	_ZN17QDeclarativeTimer11setIntervalEi @ 1755 NONAME
+	_ZN17QDeclarativeTimer12setRepeatingEb @ 1756 NONAME
+	_ZN17QDeclarativeTimer13repeatChangedEv @ 1757 NONAME
+	_ZN17QDeclarativeTimer14runningChangedEv @ 1758 NONAME
+	_ZN17QDeclarativeTimer15intervalChangedEv @ 1759 NONAME
+	_ZN17QDeclarativeTimer16staticMetaObjectE @ 1760 NONAME DATA 16
+	_ZN17QDeclarativeTimer17componentCompleteEv @ 1761 NONAME
+	_ZN17QDeclarativeTimer19getStaticMetaObjectEv @ 1762 NONAME
+	_ZN17QDeclarativeTimer19setTriggeredOnStartEb @ 1763 NONAME
+	_ZN17QDeclarativeTimer23triggeredOnStartChangedEv @ 1764 NONAME
+	_ZN17QDeclarativeTimer4stopEv @ 1765 NONAME
+	_ZN17QDeclarativeTimer5startEv @ 1766 NONAME
+	_ZN17QDeclarativeTimer6tickedEv @ 1767 NONAME
+	_ZN17QDeclarativeTimer6updateEv @ 1768 NONAME
+	_ZN17QDeclarativeTimer7restartEv @ 1769 NONAME
+	_ZN17QDeclarativeTimer8finishedEv @ 1770 NONAME
+	_ZN17QDeclarativeTimer9triggeredEv @ 1771 NONAME
+	_ZN17QDeclarativeTimerC1EP7QObject @ 1772 NONAME
+	_ZN17QDeclarativeTimerC2EP7QObject @ 1773 NONAME
+	_ZN23QDeclarativeDebugClient13statusChangedENS_6StatusE @ 1774 NONAME
+	_ZN23QDeclarativeDebugClientD0Ev @ 1775 NONAME
+	_ZN23QDeclarativeDebugClientD1Ev @ 1776 NONAME
+	_ZN23QDeclarativeDebugClientD2Ev @ 1777 NONAME
+	_ZN23QDeclarativeEngineDebug13statusChangedENS_6StatusE @ 1778 NONAME
+	_ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME
+	_ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME
+	_ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME
+	_ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME
+	_ZN26QDeclarativeBasePositioner10addChangedEv @ 1783 NONAME
+	_ZN26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1784 NONAME
+	_ZN26QDeclarativeBasePositioner10setSpacingEi @ 1785 NONAME
+	_ZN26QDeclarativeBasePositioner11moveChangedEv @ 1786 NONAME
+	_ZN26QDeclarativeBasePositioner11qt_metacallEN11QMetaObject4CallEiPPv @ 1787 NONAME
+	_ZN26QDeclarativeBasePositioner11qt_metacastEPKc @ 1788 NONAME
+	_ZN26QDeclarativeBasePositioner14prePositioningEv @ 1789 NONAME
+	_ZN26QDeclarativeBasePositioner14spacingChangedEv @ 1790 NONAME
+	_ZN26QDeclarativeBasePositioner16staticMetaObjectE @ 1791 NONAME DATA 16
+	_ZN26QDeclarativeBasePositioner17componentCompleteEv @ 1792 NONAME
+	_ZN26QDeclarativeBasePositioner19getStaticMetaObjectEv @ 1793 NONAME
+	_ZN26QDeclarativeBasePositioner22finishApplyTransitionsEv @ 1794 NONAME
+	_ZN26QDeclarativeBasePositioner29graphicsWidgetGeometryChangedEv @ 1795 NONAME
+	_ZN26QDeclarativeBasePositioner6setAddEP22QDeclarativeTransition @ 1796 NONAME
+	_ZN26QDeclarativeBasePositioner7setMoveEP22QDeclarativeTransition @ 1797 NONAME
+	_ZN26QDeclarativeBasePositioner9positionXEiRKNS_14PositionedItemE @ 1798 NONAME
+	_ZN26QDeclarativeBasePositioner9positionYEiRKNS_14PositionedItemE @ 1799 NONAME
+	_ZN26QDeclarativeBasePositionerC2ENS_14PositionerTypeEP16QDeclarativeItem @ 1800 NONAME
+	_ZN26QDeclarativeBasePositionerC2ER33QDeclarativeBasePositionerPrivateNS_14PositionerTypeEP16QDeclarativeItem @ 1801 NONAME
+	_ZN26QDeclarativeBasePositionerD0Ev @ 1802 NONAME
+	_ZN26QDeclarativeBasePositionerD1Ev @ 1803 NONAME
+	_ZN26QDeclarativeBasePositionerD2Ev @ 1804 NONAME
+	_ZN27QDeclarativeDebugConnectionD0Ev @ 1805 NONAME
+	_ZN27QDeclarativeDebugConnectionD1Ev @ 1806 NONAME
+	_ZN27QDeclarativeDebugConnectionD2Ev @ 1807 NONAME
+	_ZN29QDeclarativeAbstractAnimation10classBeginEv @ 1808 NONAME
+	_ZN29QDeclarativeAbstractAnimation10setRunningEb @ 1809 NONAME
+	_ZN29QDeclarativeAbstractAnimation10transitionER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyENS_19TransitionDirectionE @ 1810 NONAME
+	_ZN29QDeclarativeAbstractAnimation11currentTimeEv @ 1811 NONAME
+	_ZN29QDeclarativeAbstractAnimation11qt_metacallEN11QMetaObject4CallEiPPv @ 1812 NONAME
+	_ZN29QDeclarativeAbstractAnimation11qt_metacastEPKc @ 1813 NONAME
+	_ZN29QDeclarativeAbstractAnimation13pausedChangedEb @ 1814 NONAME
+	_ZN29QDeclarativeAbstractAnimation14runningChangedEb @ 1815 NONAME
+	_ZN29QDeclarativeAbstractAnimation14setCurrentTimeEi @ 1816 NONAME
+	_ZN29QDeclarativeAbstractAnimation16loopCountChangedEi @ 1817 NONAME
+	_ZN29QDeclarativeAbstractAnimation16setDefaultTargetERK20QDeclarativeProperty @ 1818 NONAME
+	_ZN29QDeclarativeAbstractAnimation16staticMetaObjectE @ 1819 NONAME DATA 16
+	_ZN29QDeclarativeAbstractAnimation16timelineCompleteEv @ 1820 NONAME
+	_ZN29QDeclarativeAbstractAnimation17componentCompleteEv @ 1821 NONAME
+	_ZN29QDeclarativeAbstractAnimation17setAlwaysRunToEndEb @ 1822 NONAME
+	_ZN29QDeclarativeAbstractAnimation18componentFinalizedEv @ 1823 NONAME
+	_ZN29QDeclarativeAbstractAnimation19getStaticMetaObjectEv @ 1824 NONAME
+	_ZN29QDeclarativeAbstractAnimation20notifyRunningChangedEb @ 1825 NONAME
+	_ZN29QDeclarativeAbstractAnimation21alwaysRunToEndChangedEb @ 1826 NONAME
+	_ZN29QDeclarativeAbstractAnimation21setDisableUserControlEv @ 1827 NONAME
+	_ZN29QDeclarativeAbstractAnimation4stopEv @ 1828 NONAME
+	_ZN29QDeclarativeAbstractAnimation5pauseEv @ 1829 NONAME
+	_ZN29QDeclarativeAbstractAnimation5startEv @ 1830 NONAME
+	_ZN29QDeclarativeAbstractAnimation6resumeEv @ 1831 NONAME
+	_ZN29QDeclarativeAbstractAnimation7restartEv @ 1832 NONAME
+	_ZN29QDeclarativeAbstractAnimation7startedEv @ 1833 NONAME
+	_ZN29QDeclarativeAbstractAnimation8completeEv @ 1834 NONAME
+	_ZN29QDeclarativeAbstractAnimation8setGroupEP26QDeclarativeAnimationGroup @ 1835 NONAME
+	_ZN29QDeclarativeAbstractAnimation8setLoopsEi @ 1836 NONAME
+	_ZN29QDeclarativeAbstractAnimation9completedEv @ 1837 NONAME
+	_ZN29QDeclarativeAbstractAnimation9setPausedEb @ 1838 NONAME
+	_ZN29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1839 NONAME
+	_ZN29QDeclarativeAbstractAnimationC2EP7QObject @ 1840 NONAME
+	_ZN29QDeclarativeAbstractAnimationC2ER36QDeclarativeAbstractAnimationPrivateP7QObject @ 1841 NONAME
+	_ZN29QDeclarativeAbstractAnimationD0Ev @ 1842 NONAME
+	_ZN29QDeclarativeAbstractAnimationD1Ev @ 1843 NONAME
+	_ZN29QDeclarativeAbstractAnimationD2Ev @ 1844 NONAME
+	_ZNK16QDeclarativeType20attachedPropertiesIdEv @ 1845 NONAME
+	_ZNK17QDeclarativeTimer10metaObjectEv @ 1846 NONAME
+	_ZNK17QDeclarativeTimer11isRepeatingEv @ 1847 NONAME
+	_ZNK17QDeclarativeTimer16triggeredOnStartEv @ 1848 NONAME
+	_ZNK17QDeclarativeTimer8intervalEv @ 1849 NONAME
+	_ZNK17QDeclarativeTimer9isRunningEv @ 1850 NONAME
+	_ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME
+	_ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME
+	_ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
+	_ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME
+	_ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME
+	_ZNK26QDeclarativeBasePositioner4moveEv @ 1856 NONAME
+	_ZNK26QDeclarativeBasePositioner7spacingEv @ 1857 NONAME
+	_ZNK29QDeclarativeAbstractAnimation10metaObjectEv @ 1858 NONAME
+	_ZNK29QDeclarativeAbstractAnimation14alwaysRunToEndEv @ 1859 NONAME
+	_ZNK29QDeclarativeAbstractAnimation5groupEv @ 1860 NONAME
+	_ZNK29QDeclarativeAbstractAnimation5loopsEv @ 1861 NONAME
+	_ZNK29QDeclarativeAbstractAnimation8isPausedEv @ 1862 NONAME
+	_ZNK29QDeclarativeAbstractAnimation9isRunningEv @ 1863 NONAME
+	_ZTI17QDeclarativeTimer @ 1864 NONAME
+	_ZTI26QDeclarativeBasePositioner @ 1865 NONAME
+	_ZTI29QDeclarativeAbstractAnimation @ 1866 NONAME
+	_ZTV17QDeclarativeTimer @ 1867 NONAME
+	_ZTV26QDeclarativeBasePositioner @ 1868 NONAME
+	_ZTV29QDeclarativeAbstractAnimation @ 1869 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimation10classBeginEv @ 1870 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimation17componentCompleteEv @ 1871 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimationD0Ev @ 1872 NONAME
+	_ZThn12_N29QDeclarativeAbstractAnimationD1Ev @ 1873 NONAME
+	_ZThn16_N26QDeclarativeBasePositioner17componentCompleteEv @ 1874 NONAME
+	_ZThn16_N26QDeclarativeBasePositionerD0Ev @ 1875 NONAME
+	_ZThn16_N26QDeclarativeBasePositionerD1Ev @ 1876 NONAME
+	_ZThn8_N17QDeclarativeTimer10classBeginEv @ 1877 NONAME
+	_ZThn8_N17QDeclarativeTimer17componentCompleteEv @ 1878 NONAME
+	_ZThn8_N26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1879 NONAME
+	_ZThn8_N26QDeclarativeBasePositionerD0Ev @ 1880 NONAME
+	_ZThn8_N26QDeclarativeBasePositionerD1Ev @ 1881 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME
+	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME