Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (784 commits)
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Mark all Symbian debug binaries debuggable by default
  Preventing QSoftkeyManager giving false positive memory leaks
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Fix gamma corrected source color in GL
  Make macdeployqt more robust against usage of symbolic links.
  Memory leak fix in Symbian open file dialog
  Revert binary search in QTextEngine::findItem
  Runonphone with CODA support
  ...

90 files changed, 2056 insertions, 204 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 98e15e8..72c32cb 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -78,5 +78,7 @@ contains(QT_CONFIG, private_tests) {
            qpacketprotocol
 }
 
+contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index 3a626bf..541d9a1 100644
--- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -58,7 +58,6 @@
 Q_DECLARE_METATYPE(QDeclarativeAnchors::Anchor)
 Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine)
 
-
 class tst_qdeclarativeanchors : public QObject
 {
     Q_OBJECT
@@ -291,7 +290,7 @@ void tst_qdeclarativeanchors::basicAnchorsRTL()
 
     QDeclarativeItem* rootItem = qobject_cast<QDeclarativeItem*>(view->rootObject());
     foreach(QObject *child, rootItem->children()) {
-        bool mirrored = QDeclarativeItemPrivate::get(qobject_cast<QDeclarativeItem*>(child))->anchors()->property("mirrored").toBool();
+        bool mirrored = QDeclarativeItemPrivate::get(qobject_cast<QDeclarativeItem*>(child))->anchors()->mirrored();
         QCOMPARE(mirrored, false);
     }
 
@@ -299,7 +298,7 @@ void tst_qdeclarativeanchors::basicAnchorsRTL()
         mirrorAnchors(qobject_cast<QDeclarativeItem*>(child));
 
     foreach(QObject *child, rootItem->children()) {
-        bool mirrored = QDeclarativeItemPrivate::get(qobject_cast<QDeclarativeItem*>(child))->anchors()->property("mirrored").toBool();
+        bool mirrored = QDeclarativeItemPrivate::get(qobject_cast<QDeclarativeItem*>(child))->anchors()->mirrored();
         QCOMPARE(mirrored, true);
     }
 
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 8871e45..9c20bd6 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -224,7 +224,7 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe
 
         QCOMPARE(p.name(), QString::fromUtf8(pmeta.name()));
 
-        if (pmeta.type() < QVariant::UserType) // TODO test complex types
+        if (pmeta.type() > 0 && pmeta.type() < QVariant::UserType) // TODO test complex types
             QCOMPARE(p.value(), pmeta.read(o));
 
         if (p.name() == "parent")
diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro
new file mode 100644
index 0000000..800c033
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+QT += declarative
+
+CONFIG += console
+CONFIG -= app_bundle
+
+DESTDIR = ./
+
+INSTALLS =
+
+SOURCES += main.cpp
diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
new file mode 100644
index 0000000..f5b830e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QDebug>
+#include <QDeclarativeComponent>
+#include <QDeclarativeEngine>
+#include <QStringList>
+#include <QtDeclarative/private/qdeclarativedebughelper_p.h>
+#include <QtDeclarative/private/qdeclarativedebugservice_p.h>
+
+int main(int argc, char *argv[])
+{
+    QDeclarativeDebugHelper::enableDebugging();
+
+    QApplication app(argc, argv);
+
+    const QUrl path = QUrl::fromLocalFile(app.arguments().last());
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, path);
+
+    if (!component.isReady()) {
+        qWarning() << component.errorString();
+        return -1;
+    }
+
+    QObject *obj = component.create();
+
+//    printf("%u\n", QDeclarativeDebugService::idForObject(obj));
+//    fflush(stdout);
+
+    return app.exec();
+}
diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js
new file mode 100644
index 0000000..f96f8e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.js
@@ -0,0 +1,28 @@
+function function2InScript(a)
+{
+    logger("return function2InScript");
+    root.result = a;
+}
+
+function functionInScript(a, b)
+{
+    logger("enter functionInScript");
+    var names = ["Clark Kent", "Peter Parker", "Bruce Wayne"];
+    var aliases = ["Superman", "Spiderman", "Batman"];
+    var details = {
+        category: "Superheroes",
+        names: names,
+        aliases: aliases
+    };
+    function2InScript(a + b);
+    logger("return functionInScript");
+    return details;
+}
+
+function logger(msg)
+{
+    //console.log(msg);
+    return true;
+}
+
+//DO NOT CHANGE CODE ABOVE THIS LINE
diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml
new file mode 100644
index 0000000..f062bb9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/data/backtrace1.qml
@@ -0,0 +1,41 @@
+import QtQuick 1.0
+import "backtrace1.js" as Script
+
+Item {
+    id: root
+
+    property int result:0
+
+    Component.onCompleted:
+    {
+        root.result = 10;
+        Script.functionInScript(4,5);
+        root.name = "nemo";
+        Script.logger(root.simpleBinding);
+    }
+
+    //DO NOT CHANGE CODE ABOVE
+    //ADD CODE FROM HERE
+
+    property string name
+    property int simpleBinding: result
+
+    VisualItemModel {
+        id: itemModel
+        Rectangle { height: 30; width: 80; color: "red" }
+        Rectangle { height: 30; width: 80; color: "green" }
+        Rectangle { height: 30; width: 80; color: "blue" }
+    }
+
+    ListView {
+        anchors.fill: parent
+        model: itemModel
+
+        Component.onCompleted:
+        {
+            Script.logger("List Loaded");
+        }
+    }
+
+}
+
diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro
new file mode 100644
index 0000000..720de19
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = tst_qdeclarativedebugjs.pro \
+          app
diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
new file mode 100644
index 0000000..1990c0d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
@@ -0,0 +1,1442 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/private/qdeclarativedebugclient_p.h>
+#include <QtDeclarative/private/qdeclarativedebugservice_p.h>
+#include <QtDeclarative/private/qdeclarativedebug_p.h>
+#include <QtDeclarative/private/qjsdebuggeragent_p.h>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QProcess>
+#include "../../../shared/util.h"
+#include "../shared/debugutil_p.h"
+
+class QJSDebugClient : public QDeclarativeDebugClient
+{
+    Q_OBJECT
+public:
+    QJSDebugClient(QDeclarativeDebugConnection *connection) : QDeclarativeDebugClient(QLatin1String("JSDebugger"), connection) {}
+
+    void ping();
+    void exec(const QByteArray &debuggerId, const QString &expr);
+    void setBreakpoints(const QSet<JSAgentBreakpointData> &breakpoints);
+    void setWatchExpressions(const QStringList &watchExpressions);
+    void stepOver();
+    void stepInto();
+    void interrupt();
+    void stepOut();
+    void continueExecution();
+    void expandObjectById(const QByteArray& objectName, quint64 objectId);
+    void setProperty(const QByteArray& id, qint64 objectId, const QString &property, const QString &value);
+    void activateFrame(int frameId);
+    void startCoverageCompleted();
+    void startCoverageRun();
+
+    // info from last exec
+    JSAgentWatchData exec_data;
+    QByteArray exec_iname;
+
+    QByteArray object_name;
+    QList<JSAgentWatchData> object_children;
+
+    int frame_id;
+
+    // info from last stop
+    QList<JSAgentStackData> break_stackFrames;
+    QList<JSAgentWatchData> break_watches;
+    QList<JSAgentWatchData> break_locals;
+    bool break_becauseOfException;
+    QString break_error;
+
+signals:
+    void statusHasChanged();
+
+    void pong();
+    void result();
+    void stopped();
+    void expanded();
+    void watchTriggered();
+    void coverageScriptLoaded();
+    void coverageFuncEntered();
+    void coverageFuncExited();
+    void coveragePosChanged();
+    void coverageCompleted();
+
+protected:
+    virtual void statusChanged(Status status);
+    virtual void messageReceived(const QByteArray &data);
+
+private:
+    int m_ping;
+};
+
+class QJSDebugProcess : public QObject
+{
+    Q_OBJECT
+public:
+    QJSDebugProcess();
+    ~QJSDebugProcess();
+
+    void start(const QStringList &arguments);
+    bool waitForStarted();
+
+private slots:
+    void processAppOutput();
+
+private:
+    QProcess m_process;
+    QTimer m_timer;
+    QEventLoop m_eventLoop;
+    bool m_started;
+};
+
+class tst_QDeclarativeDebugJS : public QObject
+{
+    Q_OBJECT
+private:
+    QDeclarativeDebugConnection *m_conn;
+    QDeclarativeEngine *m_engine;
+    QJSDebugClient *m_client;
+
+private slots:
+    void pingPong();
+    void exec();
+    void setBreakpoint();
+    void stepOver();
+    void stepInto();
+    void interrupt();
+    void stepOut();
+    void continueExecution();
+    void expandObject();
+    void setProperty();
+    void setProperty2();
+    void watchExpression();
+    void activateFrame();
+    void setBreakpoint2();
+    void stepOver2();
+    void stepInto2();
+    void interrupt2();
+    void stepOut2();
+    void continueExecution2();
+    void expandObject2();
+    void setProperty3();
+    void setProperty4();
+    void activateFrame2();
+    void verifyQMLOptimizerDisabled();
+    void testCoverageCompleted();
+    void testCoverageRun();
+
+};
+
+
+void QJSDebugClient::ping()
+{
+    m_ping++;
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "PING";
+    rs << cmd;
+    rs << m_ping;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::exec(const QByteArray &debuggerId, const QString &expr)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "EXEC";
+    rs << cmd;
+    rs << debuggerId;
+    rs << expr;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::setBreakpoints(const QSet<JSAgentBreakpointData> &breakpoints)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "BREAKPOINTS";
+    rs << cmd
+       << breakpoints;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::setWatchExpressions(const QStringList &watchExpressions)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "WATCH_EXPRESSIONS";
+    rs << cmd
+       << watchExpressions;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::stepOver()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "STEPOVER";
+    rs << cmd;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::stepInto()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "STEPINTO";
+    rs << cmd;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::interrupt()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "INTERRUPT";
+    rs << cmd;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::stepOut()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "STEPOUT";
+    rs << cmd;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::continueExecution()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "CONTINUE";
+    rs << cmd;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::expandObjectById(const QByteArray& objectName, quint64 objectId)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "EXPAND";
+    rs << cmd
+       << objectName
+       << objectId;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::setProperty(const QByteArray& id, qint64 objectId, const QString &property, const QString &value)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "SET_PROPERTY";
+    rs << cmd
+       << id
+       << objectId
+       << property
+       << value;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::activateFrame(int frameId)
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "ACTIVATE_FRAME";
+    rs << cmd
+       << frameId;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::startCoverageRun()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "COVERAGE";
+    bool enabled = true;
+    rs << cmd
+       << enabled;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::startCoverageCompleted()
+{
+    QByteArray reply;
+    QDataStream rs(&reply, QIODevice::WriteOnly);
+    QByteArray cmd = "COVERAGE";
+    bool enabled = false;
+    rs << cmd
+       << enabled;
+    sendMessage(reply);
+}
+
+void QJSDebugClient::statusChanged(Status /*status*/)
+{
+    emit statusHasChanged();
+}
+
+void QJSDebugClient::messageReceived(const QByteArray &data)
+{
+    QByteArray rwData = data;
+    QDataStream stream(&rwData, QIODevice::ReadOnly);
+
+    QByteArray command;
+    stream >> command;
+
+    if (command == "STOPPED") {
+        stream >> break_stackFrames >> break_watches >> break_locals >> break_becauseOfException >> break_error;
+        if (!break_becauseOfException) {
+            break_error.clear();
+        }
+        emit stopped();
+    } else if (command == "RESULT") {
+        stream >> exec_iname;
+        stream >> exec_data;
+        emit result();
+    } else if (command == "EXPANDED") {
+        stream >> object_name >> object_children;
+        emit expanded();
+    } else if (command == "LOCALS") {
+        stream >> frame_id >> break_locals;
+        if (!stream.atEnd()) { // compatibility with jsdebuggeragent from 2.1, 2.2
+            stream >> break_watches;
+        }
+        emit watchTriggered();
+    } else if (command == "PONG") {
+        int ping;
+        stream >> ping;
+        QCOMPARE(ping, m_ping);
+        emit pong();
+    } else if (command == "COVERAGE") {
+        qint64 time;
+        int messageType;
+        qint64 scriptId;
+        QString program;
+        QString fileName;
+        int baseLineNumber;
+        int lineNumber;
+        int columnNumber;
+        QString returnValue;
+
+        stream >> time >> messageType >> scriptId >> program >> fileName >> baseLineNumber
+        >> lineNumber >> columnNumber >> returnValue;
+        if (messageType == CoverageComplete) {
+            emit coverageCompleted();
+        } else if (messageType == CoverageScriptLoad) {
+            emit coverageScriptLoaded();
+        } else if (messageType == CoveragePosChange) {
+            emit coveragePosChanged();
+        } else if (messageType == CoverageFuncEntry) {
+            emit coverageFuncEntered();
+        } else if (messageType == CoverageFuncExit) {
+            emit coverageFuncExited();
+        }
+    } else {
+        QFAIL("Unknown message :" + command);
+    }
+    QVERIFY(stream.atEnd());
+}
+
+QJSDebugProcess::QJSDebugProcess()
+    : m_started(false)
+{
+    m_process.setProcessChannelMode(QProcess::MergedChannels);
+    connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput()));
+    connect(&m_timer, SIGNAL(timeout()), &m_eventLoop, SLOT(quit()));
+    m_timer.setSingleShot(true);
+    m_timer.setInterval(5000);
+    QStringList environment = QProcess::systemEnvironment();
+    environment.append("QML_DISABLE_OPTIMIZER=1");
+    m_process.setEnvironment(environment);
+}
+
+QJSDebugProcess::~QJSDebugProcess()
+{
+    if (m_process.state() != QProcess::NotRunning) {
+        m_process.kill();
+        m_process.waitForFinished(5000);
+    }
+}
+
+void QJSDebugProcess::start(const QStringList &arguments)
+{
+    QString currentDir = QFileInfo(__FILE__).absoluteDir().absolutePath();
+    m_process.start(currentDir + "/app/app", arguments);
+    m_timer.start();
+}
+
+bool QJSDebugProcess::waitForStarted()
+{
+    m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+
+    return m_started;
+}
+
+void QJSDebugProcess::processAppOutput()
+{
+    const QString appOutput = m_process.readAll();
+    static QRegExp newline("[\n\r]{1,2}");
+    QStringList lines = appOutput.split(newline);
+    foreach (const QString &line, lines) {
+        if (line.isEmpty())
+            continue;
+        if (line.startsWith("Qml debugging is enabled")) // ignore
+            continue;
+        if (line.startsWith("QDeclarativeDebugServer:")) {
+            if (line.contains("Waiting for connection ")) {
+                m_started = true;
+                m_eventLoop.quit();
+                continue;
+            }
+            if (line.contains("Connection established")) {
+                continue;
+            }
+        }
+        qDebug() << line;
+    }
+}
+
+inline QString TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return fileInfo.absoluteDir().filePath("data/" + filename);
+}
+
+void tst_QDeclarativeDebugJS::pingPong()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QJSDebugClient client(&connection);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    client.ping();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(pong())));
+}
+
+void tst_QDeclarativeDebugJS::exec()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QJSDebugClient client(&connection);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    // Evaluate script without context
+    client.exec("queryid", "1+1");
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(result())));
+    QCOMPARE(client.exec_iname, QByteArray("queryid"));
+    QCOMPARE(client.exec_data.exp, QByteArray("1+1"));
+    QCOMPARE(client.exec_data.name, QByteArray("1+1"));
+    QCOMPARE(client.exec_data.hasChildren, false);
+    QCOMPARE(client.exec_data.type, QByteArray("Number"));
+    QCOMPARE(client.exec_data.value, QByteArray("2"));
+
+    // TODO: Test access to context after breakpoint is hit
+}
+
+
+void tst_QDeclarativeDebugJS::setBreakpoint()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    //TEST LINE
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.fileUrl, bp1.fileUrl);
+    QCOMPARE(data.lineNumber, bp1.lineNumber);
+
+}
+
+void tst_QDeclarativeDebugJS::stepOver()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepOver();
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.fileUrl, bp1.fileUrl);
+    QCOMPARE(data.lineNumber, bp1.lineNumber +1);
+}
+
+void tst_QDeclarativeDebugJS::stepInto()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 12;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepInto();
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    QByteArray functionName("functionInScript");
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.functionName, functionName);
+    QCOMPARE(data.fileUrl, QByteArray(QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded()));
+}
+
+void tst_QDeclarativeDebugJS::interrupt()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 12;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.interrupt();
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    QByteArray functionName("functionInScript");
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.functionName, functionName);
+    QCOMPARE(data.fileUrl, QByteArray(QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded()));
+}
+
+void tst_QDeclarativeDebugJS::stepOut()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1,bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 12;
+
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp2.lineNumber = 13;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepOut();
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+    JSAgentStackData data = client.break_stackFrames.at(0);
+
+    QCOMPARE(data.fileUrl, bp2.fileUrl);
+    QCOMPARE(data.lineNumber, bp2.lineNumber);
+
+}
+
+void tst_QDeclarativeDebugJS::continueExecution()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp2.lineNumber = 13;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.continueExecution();
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.fileUrl, bp2.fileUrl);
+    QCOMPARE(data.lineNumber, bp2.lineNumber);
+}
+
+void tst_QDeclarativeDebugJS::expandObject()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    foreach ( JSAgentWatchData data, client.break_locals)
+    {
+        if( data.name == "details")
+        {
+            //TEST LINE
+            client.expandObjectById(data.name,data.objectId);
+        }
+    }
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+    QCOMPARE(client.object_name,QByteArray("details"));
+    QCOMPARE(client.object_children.at(0).name,QByteArray("category"));
+    QCOMPARE(client.object_children.at(0).type,QByteArray("String"));
+    QCOMPARE(client.object_children.at(1).name,QByteArray("names"));
+    QCOMPARE(client.object_children.at(1).type,QByteArray("Array"));
+    QCOMPARE(client.object_children.at(2).name,QByteArray("aliases"));
+    QCOMPARE(client.object_children.at(2).type,QByteArray("Array"));
+
+}
+
+void tst_QDeclarativeDebugJS::setProperty()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp2.lineNumber = 18;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    quint64 objectId;
+    QByteArray objectName;
+
+    foreach ( JSAgentWatchData data, client.break_locals)
+    {
+        if( data.name == "details")
+        {
+            objectId = data.objectId;
+            objectName = data.name;
+            //TEST LINE
+            client.setProperty(data.name, data.objectId, "total", "names.length");
+        }
+    }
+
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+    client.expandObjectById(objectName,objectId);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+
+    QCOMPARE(client.object_name,QByteArray("details"));
+    QCOMPARE(client.object_children.at(0).name,QByteArray("category"));
+    QCOMPARE(client.object_children.at(0).type,QByteArray("String"));
+    QCOMPARE(client.object_children.at(0).value,QByteArray("Superheroes"));
+    QCOMPARE(client.object_children.at(1).name,QByteArray("names"));
+    QCOMPARE(client.object_children.at(1).type,QByteArray("Array"));
+    QCOMPARE(client.object_children.at(2).name,QByteArray("aliases"));
+    QCOMPARE(client.object_children.at(2).type,QByteArray("Array"));
+    QCOMPARE(client.object_children.at(3).name,QByteArray("total"));
+    QCOMPARE(client.object_children.at(3).type,QByteArray("Number"));
+    //    foreach ( JSAgentWatchData data, client.object_children)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+}
+
+void tst_QDeclarativeDebugJS::setProperty2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp2.lineNumber = 18;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    quint64 objectId;
+    QByteArray objectName;
+
+    foreach ( JSAgentWatchData data, client.break_locals)
+    {
+        if( data.name == "details")
+        {
+            objectId = data.objectId;
+            objectName = data.name;
+            //TEST LINE
+            client.setProperty(data.name, data.objectId, "category", data.name + ".category = 'comic characters'");
+        }
+    }
+
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+    client.expandObjectById(objectName,objectId);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+
+    QCOMPARE(client.object_name,QByteArray("details"));
+    QCOMPARE(client.object_children.at(0).name,QByteArray("category"));
+    QCOMPARE(client.object_children.at(0).type,QByteArray("String"));
+    QCOMPARE(client.object_children.at(0).value,QByteArray("comic characters"));
+    QCOMPARE(client.object_children.at(1).name,QByteArray("names"));
+    QCOMPARE(client.object_children.at(1).type,QByteArray("Array"));
+    QCOMPARE(client.object_children.at(2).name,QByteArray("aliases"));
+    QCOMPARE(client.object_children.at(2).type,QByteArray("Array"));
+
+    //    foreach ( JSAgentWatchData data, client.object_children)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+}
+
+void tst_QDeclarativeDebugJS::watchExpression()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    QByteArray watchExpression("root.result = 20");
+    QStringList watchList;
+    watchList.append(QString(watchExpression));
+
+    //TEST LINE
+    client.setWatchExpressions(watchList);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentWatchData data = client.break_watches.at(0);
+    QCOMPARE(data.exp, watchExpression);
+    QCOMPARE(data.value.toInt(), 20);
+    QCOMPARE(data.type, QByteArray("Number"));
+}
+
+void tst_QDeclarativeDebugJS::activateFrame()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 3;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.activateFrame(2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(watchTriggered())));
+
+    QCOMPARE(client.break_locals.at(1).name,QByteArray("names"));
+    QCOMPARE(client.break_locals.at(1).type,QByteArray("Array"));
+    QCOMPARE(client.break_locals.at(2).name,QByteArray("a"));
+    QCOMPARE(client.break_locals.at(2).type,QByteArray("Number"));
+    QCOMPARE(client.break_locals.at(2).value,QByteArray("4"));
+    QCOMPARE(client.break_locals.at(3).name,QByteArray("b"));
+    QCOMPARE(client.break_locals.at(3).type,QByteArray("Number"));
+    QCOMPARE(client.break_locals.at(3).value,QByteArray("5"));
+
+    //    foreach ( JSAgentWatchData data, client.break_locals)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+
+}
+
+void tst_QDeclarativeDebugJS::setBreakpoint2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 40;
+
+    //TEST LINE
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(!QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+}
+
+void tst_QDeclarativeDebugJS::stepOver2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepOver();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepOver();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.fileUrl, bp1.fileUrl);
+    QCOMPARE(data.lineNumber, bp1.lineNumber +2);
+}
+
+void tst_QDeclarativeDebugJS::stepInto2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    QByteArray functionName("logger");
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.functionName, functionName);
+    QCOMPARE(data.fileUrl, QByteArray(QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded()));
+}
+
+void tst_QDeclarativeDebugJS::interrupt2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.interrupt();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.interrupt();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    QByteArray functionName("logger");
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.functionName, functionName);
+    QCOMPARE(data.fileUrl, QByteArray(QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded()));
+}
+
+void tst_QDeclarativeDebugJS::stepOut2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1,bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 12;
+
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp2.lineNumber = 13;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.stepOut();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepOut();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+
+    QCOMPARE(data.fileUrl, bp2.fileUrl);
+    QCOMPARE(data.lineNumber, bp2.lineNumber);
+
+}
+
+void tst_QDeclarativeDebugJS::continueExecution2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2, bp3;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 11;
+
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp2.lineNumber = 12;
+
+    bp3.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp3.lineNumber = 13;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2 << bp3);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    JSAgentStackData data = client.break_stackFrames.at(0);
+    QCOMPARE(data.fileUrl, bp3.fileUrl);
+    QCOMPARE(data.lineNumber, bp3.lineNumber);
+}
+
+void tst_QDeclarativeDebugJS::expandObject2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.expandObjectById(QByteArray("details"),123);
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+    QCOMPARE(client.object_name,QByteArray("details"));
+
+    QEXPECT_FAIL("", "", Continue);
+            QCOMPARE(client.object_children.length(),0);
+
+}
+
+void tst_QDeclarativeDebugJS::setProperty3()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp2.lineNumber = 18;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    quint64 objectId;
+    QByteArray objectName;
+
+    foreach ( JSAgentWatchData data, client.break_locals)
+    {
+        if( data.name == "details")
+        {
+            objectId = data.objectId;
+            objectName = data.name;
+            //TEST LINE
+            client.setProperty(data.name, 123, "total", "names.length");
+        }
+    }
+
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+    client.expandObjectById(objectName,objectId);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+
+    QCOMPARE(client.object_name,QByteArray("details"));
+    QCOMPARE(client.object_children.length(),3);
+
+    //    foreach ( JSAgentWatchData data, client.object_children)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+}
+
+void tst_QDeclarativeDebugJS::setProperty4()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 17;
+    bp2.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp2.lineNumber = 18;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1 << bp2);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    quint64 objectId;
+    QByteArray objectName;
+
+    foreach ( JSAgentWatchData data, client.break_locals)
+    {
+        if( data.name == "details")
+        {
+            objectId = data.objectId;
+            objectName = data.name;
+            //TEST LINE
+            client.setProperty(data.name, 123, "category", data.name + ".category = 'comic characters'");
+        }
+    }
+
+    client.continueExecution();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+    client.expandObjectById(objectName,objectId);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(expanded())));
+
+    QCOMPARE(client.object_name,QByteArray("details"));
+    QCOMPARE(client.object_children.at(0).name,QByteArray("category"));
+    QCOMPARE(client.object_children.at(0).type,QByteArray("String"));
+    QCOMPARE(client.object_children.at(0).value,QByteArray("Superheroes"));
+    QCOMPARE(client.object_children.at(1).name,QByteArray("names"));
+    QCOMPARE(client.object_children.at(1).type,QByteArray("Array"));
+    QCOMPARE(client.object_children.at(2).name,QByteArray("aliases"));
+    QCOMPARE(client.object_children.at(2).type,QByteArray("Array"));
+
+    //    foreach ( JSAgentWatchData data, client.object_children)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+}
+
+void tst_QDeclarativeDebugJS::activateFrame2()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1, bp2;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.js")).toEncoded();
+    bp1.lineNumber = 4;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    client.stepInto();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+    //TEST LINE
+    client.activateFrame(5);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(watchTriggered())));
+
+    QCOMPARE(client.break_locals.length(),0);
+
+    //    foreach ( JSAgentWatchData data, client.break_locals)
+    //    {
+    //        qDebug() << data.name << data.type << data.value;
+    //    }
+
+}
+
+void tst_QDeclarativeDebugJS::verifyQMLOptimizerDisabled()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    QJSDebugClient client(&connection);
+
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    JSAgentBreakpointData bp1;
+    bp1.fileUrl = QUrl::fromLocalFile(TEST_FILE("backtrace1.qml")).toEncoded();
+    bp1.lineNumber = 21;
+
+    client.setBreakpoints(QSet<JSAgentBreakpointData>() << bp1);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(stopped())));
+
+}
+
+void tst_QDeclarativeDebugJS::testCoverageCompleted()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QJSDebugClient client(&connection);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    client.startCoverageCompleted();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageCompleted())));
+}
+
+void tst_QDeclarativeDebugJS::testCoverageRun()
+{
+    QJSDebugProcess process;
+    process.start(QStringList() << "-qmljsdebugger=port:3771,block" << TEST_FILE("backtrace1.qml"));
+    QVERIFY(process.waitForStarted());
+
+    QDeclarativeDebugConnection connection;
+    connection.connectToHost("127.0.0.1", 3771);
+    QVERIFY(connection.waitForConnected());
+
+    QJSDebugClient client(&connection);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    if (client.status() == QJSDebugClient::Unavailable)
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(statusHasChanged())));
+    QCOMPARE(client.status(), QJSDebugClient::Enabled);
+
+    client.startCoverageRun();
+    client.startCoverageCompleted();
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageScriptLoaded())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coveragePosChanged())));
+    //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageFuncEntered())));
+    //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageFuncExited())));
+}
+
+QTEST_MAIN(tst_QDeclarativeDebugJS)
+
+#include "tst_qdeclarativedebugjs.moc"
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro
index 171f308..8aea1b5 100644
--- a/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro
@@ -1,8 +1,12 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative script
+contains(QT_CONFIG,declarative): QT += declarative network script
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativescriptdebugging.cpp
+HEADERS += ../shared/debugutil_p.h
+
+SOURCES += tst_qdeclarativedebugjs.cpp \
+           ../shared/debugutil.cpp
+
 INCLUDEPATH += ../shared
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
@@ -16,5 +20,7 @@ symbian: {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
+OTHER_FILES = data/backtrace1.js data/backtrace1.qml
+
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
index a3e92fe..8359ad1 100644
--- a/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
@@ -1,7 +1,7 @@
 import QtQuick 1.0
 
 Flickable {
-    width: 100; height: 100
+    width: 100; height: 200
     contentWidth: column.width; contentHeight: column.height
 
     Column {
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index b077fdc..4d4c30b 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -78,10 +78,12 @@ private slots:
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
     void wheel();
+    void flickVelocity();
 
 private:
     QDeclarativeEngine engine;
 
+    void flick(QGraphicsView *canvas, const QPoint &from, const QPoint &to, int duration);
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &objectName);
 };
@@ -480,6 +482,51 @@ void tst_qdeclarativeflickable::wheel()
     delete canvas;
 }
 
+void tst_qdeclarativeflickable::flickVelocity()
+{
+#ifdef Q_WS_MAC
+    QSKIP("Producing flicks on Mac CI impossible due to timing problems", SkipAll);
+#endif
+
+    QDeclarativeView *canvas = new QDeclarativeView;
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(canvas->rootObject());
+    QVERIFY(flickable != 0);
+
+    // flick up
+    flick(canvas, QPoint(20,190), QPoint(20, 50), 200);
+    QVERIFY(flickable->verticalVelocity() > 0.0);
+    QTRY_VERIFY(flickable->verticalVelocity() == 0.0);
+
+    // flick down
+    flick(canvas, QPoint(20,10), QPoint(20, 140), 200);
+    QVERIFY(flickable->verticalVelocity() < 0.0);
+    QTRY_VERIFY(flickable->verticalVelocity() == 0.0);
+
+    delete canvas;
+}
+
+void tst_qdeclarativeflickable::flick(QGraphicsView *canvas, const QPoint &from, const QPoint &to, int duration)
+{
+    const int pointCount = 5;
+    QPoint diff = to - from;
+
+    // send press, five equally spaced moves, and release.
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(from));
+
+    for (int i = 0; i < pointCount; ++i) {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(from + (i+1)*diff/pointCount), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+        QTest::qWait(duration/pointCount);
+        QCoreApplication::processEvents();
+    }
+
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(to));
+}
 
 template<typename T>
 T *tst_qdeclarativeflickable::findItem(QGraphicsObject *parent, const QString &objectName)
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index e3f7980..4342ff3 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -450,12 +450,12 @@ void tst_QDeclarativeGridView::removed()
     model.removeItem(1);
 
     // Confirm items positioned correctly
-    for (int i = 6; i < 18; ++i) {
+    for (int i = 3; i < 15; ++i) {
         QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), (i%3)*80.0);
+        QTRY_COMPARE(item->y(), 60+(i/3)*60.0);
     }
 
     // Remove currentIndex
@@ -476,7 +476,7 @@ void tst_QDeclarativeGridView::removed()
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
         QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_VERIFY(item->y() == 60+(i/3)*60);
     }
 
     // remove item outside current view.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
new file mode 100644
index 0000000..785a27d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedComponentRoot.qml
@@ -0,0 +1,6 @@
+import QtQuick 1.0
+
+Component {
+    Item {
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
new file mode 100644
index 0000000..361bcbc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedComponentRoots.qml
@@ -0,0 +1,4 @@
+import QtQuick 1.0
+
+NestedComponentRoot {
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index d6e6a4a..7f186b3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -135,6 +135,7 @@ private slots:
     void reservedWords_data();
     void reservedWords();
     void inlineAssignmentsOverrideBindings();
+    void nestedComponentRoots();
 
     void basicRemote_data();
     void basicRemote();
@@ -1425,6 +1426,12 @@ void tst_qdeclarativelanguage::inlineAssignmentsOverrideBindings()
     delete o;
 }
 
+// QTBUG-19354
+void tst_qdeclarativelanguage::nestedComponentRoots()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("nestedComponentRoots.qml"));
+}
+
 // Import tests (QT-558)
 void tst_qdeclarativelanguage::importsBuiltin_data()
 {
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index d75960c..0d581d4 100644
--- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -174,7 +174,7 @@ void tst_qdeclarativeqt::rect()
     QCOMPARE(qvariant_cast<QRectF>(object->property("test2")), QRectF(-10, 13, 100, 109.6));
     QCOMPARE(qvariant_cast<QRectF>(object->property("test3")), QRectF());
     QCOMPARE(qvariant_cast<QRectF>(object->property("test4")), QRectF());
-    QCOMPARE(qvariant_cast<QRectF>(object->property("test5")), QRectF());
+    QCOMPARE(qvariant_cast<QRectF>(object->property("test5")), QRectF(10, 13, 100, -109));
 
     delete object;
 }
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js
deleted file mode 100644
index 8decbf0..0000000
--- a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js
+++ /dev/null
@@ -1,11 +0,0 @@
-
-function function2InScript(a)
-{
-    mainRectangle.foo = a;
-}
-
-
-function functionInScript(a , b)
-{
-    function2InScript(a + b);
-}
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml
deleted file mode 100644
index 9096c32..0000000
--- a/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 1.0
-import Qt.test 1.0
-import "backtrace1.js" as Script
-
-Rectangle {
-    id: mainRectangle
-
-    property string foo: "Default";
-    width: 200
-    height: 200
-
-
-    MyTestObject {
-
-        function append(a, b) {
-            return a + " " + b;
-        }
-
-
-        id: testObject;
-        someProperty: append("Hello", mainRectangle.foo)
-
-        onSignaled: {
-            Script.functionInScript(value , "b");
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp b/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp
deleted file mode 100644
index 4301174..0000000
--- a/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativeitem.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtCore/QDir>
-#include <QtScript/QScriptEngineAgent>
-#include <private/qdeclarativeengine_p.h>
-
-class MyTestObject : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString someProperty READ someProperty WRITE setSomeProperty NOTIFY somePropertyChanged)
-
-public:
-    QString someProperty() { return _someProperty; }
-    void setSomeProperty(const QString &p) { _someProperty = p; }
-    QString _someProperty;
-
-    void emitSignal(const QString &value) { emit signaled(value); }
-
-signals:
-    void signaled(const QString &value);
-    void somePropertyChanged();
-};
-
-
-class BtAgent : public QScriptEngineAgent {
-public:
-    BtAgent(QScriptEngine *engine) : QScriptEngineAgent(engine)
-    { count = 0; engine->setAgent(this); }
-
-    QStringList bt;
-    int count;
-    int breakpoint;
-    void positionChange(qint64 , int lineNumber, int )
-    {
-        if(lineNumber == breakpoint) {
-            count++;
-            bt = engine()->currentContext()->backtrace();
-        }
-    }
-};
-
-
-
-/*
-This test covers evaluation of ECMAScript expressions and bindings from within
-QML.  This does not include static QML language issues.
-
-Static QML language issues are covered in qmllanguage
-*/
-inline QUrl TEST_FILE(const QString &filename)
-{
-    QFileInfo fileInfo(__FILE__);
-    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
-    return TEST_FILE(QLatin1String(filename));
-}
-
-class tst_qdeclarativescriptdebugging : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qdeclarativescriptdebugging() {}
-
-private slots:
-    void initTestCase();
-    void backtrace1();
-};
-
-void tst_qdeclarativescriptdebugging::initTestCase()
-{
-        qmlRegisterType<MyTestObject>("Qt.test", 1,0, "MyTestObject");
-}
-
-void tst_qdeclarativescriptdebugging::backtrace1()
-{
-    {
-    QDeclarativeEngine engine;
-    QUrl file = TEST_FILE("backtrace1.qml");
-    QDeclarativeComponent component(&engine, file);
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
-    QVERIFY(item);
-    MyTestObject *obj = item->findChild<MyTestObject *>();
-    QVERIFY(obj);
-    QCOMPARE(obj->someProperty(), QString("Hello Default"));
-
-    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&engine);
-    BtAgent agent(&ep->scriptEngine);
-    agent.breakpoint = 16;
-
-    obj->emitSignal("blah");
-    QCOMPARE(obj->someProperty(), QString("Hello blahb"));
-    QCOMPARE(agent.count, 1);
-
-    QStringList expected;
-    expected << "append(a = 'Hello', b = 'blahb') at @PREFIX@/backtrace1.qml:16"
-             << "$someProperty() at @PREFIX@/backtrace1.qml:21"
-             << "function2InScript(a = 'blahb') at @PREFIX@/backtrace1.js:4"
-             << "functionInScript(a = 'blah', b = 'b') at @PREFIX@/backtrace1.js:10"
-             << "onSignaled() at @PREFIX@/backtrace1.qml:24"
-             << "<global>() at -1";
-    expected.replaceInStrings("@PREFIX@", file.toString().section('/', 0, -2));
-    QCOMPARE(agent.bt, expected);
-    }
-}
-
-
-QTEST_MAIN(tst_qdeclarativescriptdebugging)
-
-#include "tst_qdeclarativescriptdebugging.moc"
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 1720c33..280f952 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -52,6 +52,8 @@
 #include <QInputContext>
 #include <private/qapplication_p.h>
 
+#include "qplatformdefs.h"
+
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
 #define SRCDIR "."
@@ -133,6 +135,9 @@ private slots:
     void focusOutClearSelection();
 
     void echoMode();
+#ifdef QT_GUI_PASSWORD_ECHO_DELAY
+    void passwordEchoDelay();
+#endif
     void geometrySignals();
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
@@ -2051,6 +2056,62 @@ void tst_qdeclarativetextinput::echoMode()
     delete canvas;
 }
 
+
+#ifdef QT_GUI_PASSWORD_ECHO_DELAY
+void tst_qdeclarativetextinput::passwordEchoDelay()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/echoMode.qml");
+    canvas->show();
+    canvas->setFocus();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeTextInput *input = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+
+    QChar fillChar = QLatin1Char('*');
+
+    input->setEchoMode(QDeclarativeTextInput::Password);
+    QCOMPARE(input->displayText(), QString(8, fillChar));
+    input->setText(QString());
+    QCOMPARE(input->displayText(), QString());
+
+    QTest::keyPress(canvas, '0');
+    QTest::keyPress(canvas, '1');
+    QTest::keyPress(canvas, '2');
+    QCOMPARE(input->displayText(), QString(2, fillChar) + QLatin1Char('2'));
+    QTest::keyPress(canvas, '3');
+    QTest::keyPress(canvas, '4');
+    QCOMPARE(input->displayText(), QString(4, fillChar) + QLatin1Char('4'));
+    QTest::keyPress(canvas, Qt::Key_Backspace);
+    QCOMPARE(input->displayText(), QString(4, fillChar));
+    QTest::keyPress(canvas, '4');
+    QCOMPARE(input->displayText(), QString(4, fillChar) + QLatin1Char('4'));
+    QTest::qWait(QT_GUI_PASSWORD_ECHO_DELAY);
+    QTRY_COMPARE(input->displayText(), QString(5, fillChar));
+    QTest::keyPress(canvas, '5');
+    QCOMPARE(input->displayText(), QString(5, fillChar) + QLatin1Char('5'));
+    input->setFocus(false);
+    QVERIFY(!input->hasFocus());
+    QCOMPARE(input->displayText(), QString(6, fillChar));
+    input->setFocus(true);
+    QTRY_VERIFY(input->hasFocus());
+    QCOMPARE(input->displayText(), QString(6, fillChar));
+    QTest::keyPress(canvas, '6');
+    QCOMPARE(input->displayText(), QString(6, fillChar) + QLatin1Char('6'));
+
+    QInputMethodEvent ev;
+    ev.setCommitString(QLatin1String("7"));
+    QApplication::sendEvent(canvas, &ev);
+    QCOMPARE(input->displayText(), QString(7, fillChar) + QLatin1Char('7'));
+
+    delete canvas;
+}
+#endif
+
+
 void tst_qdeclarativetextinput::simulateKey(QDeclarativeView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
@@ -2431,15 +2492,20 @@ void tst_qdeclarativetextinput::preeditAutoScroll()
     QTest::qWaitForWindowShown(&view);
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
 
+    QSignalSpy cursorRectangleSpy(&input, SIGNAL(cursorRectangleChanged()));
+    int cursorRectangleChanges = 0;
+
     // test the text is scrolled so the preedit is visible.
     ic.sendPreeditText(preeditText.mid(0, 3), 1);
     QVERIFY(input.positionAt(0) != 0);
     QVERIFY(input.cursorRectangle().left() < input.boundingRect().width());
+    QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
 
     // test the text is scrolled back when the preedit is removed.
     ic.sendEvent(QInputMethodEvent());
     QCOMPARE(input.positionAt(0), 0);
     QCOMPARE(input.positionAt(input.width()), 5);
+    QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
 
     // some tolerance for different fonts.
 #ifdef Q_OS_LINUX
@@ -2455,26 +2521,31 @@ void tst_qdeclarativetextinput::preeditAutoScroll()
         ic.sendPreeditText(preeditText, i + 1);
         QVERIFY(input.cursorRectangle().right() >= fm.width(preeditText.at(i)) - error);
         QVERIFY(input.positionToRectangle(0).x() < x);
+        QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
         x = input.positionToRectangle(0).x();
     }
     for (int i = 1; i >= 0; --i) {
         ic.sendPreeditText(preeditText, i + 1);
         QVERIFY(input.cursorRectangle().right() >= fm.width(preeditText.at(i)) - error);
         QVERIFY(input.positionToRectangle(0).x() > x);
+        QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
         x = input.positionToRectangle(0).x();
     }
 
     // Test incrementing the preedit cursor doesn't cause further
     // scrolling when right most text is visible.
     ic.sendPreeditText(preeditText, preeditText.length() - 3);
+    QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
     x = input.positionToRectangle(0).x();
     for (int i = 2; i >= 0; --i) {
         ic.sendPreeditText(preeditText, preeditText.length() - i);
         QCOMPARE(input.positionToRectangle(0).x(), x);
+        QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
     }
     for (int i = 1; i <  3; ++i) {
         ic.sendPreeditText(preeditText, preeditText.length() - i);
         QCOMPARE(input.positionToRectangle(0).x(), x);
+        QCOMPARE(cursorRectangleSpy.count(), ++cursorRectangleChanges);
     }
 
     // Test disabling auto scroll.
diff --git a/tests/auto/declarative/qmlshadersplugin/main.qml b/tests/auto/declarative/qmlshadersplugin/main.qml
new file mode 100644
index 0000000..28c81e0
--- /dev/null
+++ b/tests/auto/declarative/qmlshadersplugin/main.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+ Rectangle {
+     width: 300
+     height: 300
+
+     Text {
+         id: textLabel
+         text: "Hello World"
+         anchors.centerIn: parent
+         font.pixelSize: 48
+     }
+
+     ShaderEffectItem {
+         objectName: "effectItem"
+         property variant source: ShaderEffectSource { objectName: "effectSource"; sourceItem: textLabel; hideSource: true }
+         property real wiggleAmount: 0.01
+         anchors.fill: textLabel
+
+         SequentialAnimation on wiggleAmount {
+             loops: Animation.Infinite
+             NumberAnimation { to: -0.01; duration: 500 }
+             NumberAnimation { to: 0.01; duration: 500 }
+         }
+
+         fragmentShader: "
+         varying highp vec2 qt_TexCoord0;
+         uniform sampler2D source;
+         uniform highp float wiggleAmount;
+         void main(void)
+         {
+             highp vec2 wiggledTexCoord = qt_TexCoord0;
+             wiggledTexCoord.s += sin(4.0 * 3.141592653589 * wiggledTexCoord.t) * wiggleAmount;
+             gl_FragColor = texture2D(source, wiggledTexCoord.st);
+         }
+         "
+     }
+ }
diff --git a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro
new file mode 100644
index 0000000..aa0e07a
--- /dev/null
+++ b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro
@@ -0,0 +1,18 @@
+load(qttest_p4)
+
+QT += opengl declarative
+SOURCES += tst_qmlshadersplugin.cpp
+
+SOURCES += \
+    ../../../../src/imports/shaders/shadereffectitem.cpp \
+    ../../../../src/imports/shaders/shadereffectsource.cpp \
+    ../../../../src/imports/shaders/shadereffect.cpp \
+    ../../../../src/imports/shaders/shadereffectbuffer.cpp \
+    ../../../../src/imports/shaders/scenegraph/qsggeometry.cpp
+
+HEADERS += \
+    ../../../../src/imports/shaders/shadereffectitem.h \
+    ../../../../src/imports/shaders/shadereffectsource.h \
+    ../../../../src/imports/shaders/shadereffect.h \
+    ../../../../src/imports/shaders/shadereffectbuffer.h \
+    ../../../../src/imports/shaders/scenegraph/qsggeometry.h
diff --git a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp
new file mode 100644
index 0000000..4d9e28e
--- /dev/null
+++ b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp
@@ -0,0 +1,205 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtDeclarative>
+#include "../../../../src/imports/shaders/shadereffectitem.h"
+#include "../../../../src/imports/shaders/shadereffectsource.h"
+#include "../../../../src/imports/shaders/shadereffect.h"
+
+static const char qt_default_vertex_code[] =
+        "uniform highp mat4 qt_ModelViewProjectionMatrix;\n"
+        "attribute highp vec4 qt_Vertex;\n"
+        "attribute highp vec2 qt_MultiTexCoord0;\n"
+        "varying highp vec2 qt_TexCoord0;\n"
+        "void main(void)\n"
+        "{\n"
+            "qt_TexCoord0 = qt_MultiTexCoord0;\n"
+            "gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;\n"
+        "}\n";
+
+static const char qt_default_fragment_code[] =
+        "varying highp vec2 qt_TexCoord0;\n"
+        "uniform lowp sampler2D source;\n"
+        "void main(void)\n"
+        "{\n"
+            "gl_FragColor = texture2D(source, qt_TexCoord0.st);\n"
+        "}\n";
+
+class tst_qmlshadersplugin : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void shaderEffectItemAPI();
+    void shaderEffectSourceAPI();
+    void combined();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+void tst_qmlshadersplugin::initTestCase()
+{
+    const char *uri ="Qt.labs.shaders";
+    qmlRegisterType<ShaderEffectItem>(uri, 1, 0, "ShaderEffectItem");
+    qmlRegisterType<ShaderEffectSource>(uri, 1, 0, "ShaderEffectSource");
+}
+
+
+void tst_qmlshadersplugin::shaderEffectItemAPI()
+{
+    // Creation
+    QString componentStr = "import QtQuick 1.0\n"
+            "import Qt.labs.shaders 1.0\n"
+            "ShaderEffectItem {\n"
+            "property variant source\n"
+            "width: 200; height: 300\n"
+            "}";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+
+    QObject *obj = component.create();
+    QTest::qWait(100);
+    QVERIFY(obj != 0);
+
+    // Default values
+    QCOMPARE(obj->property("width").toDouble(), 200.);
+    QCOMPARE(obj->property("height").toDouble(), 300.);
+    QCOMPARE(obj->property("fragmentShader").toString(), QString(""));
+    QCOMPARE(obj->property("vertexShader").toString(), QString(""));
+    QCOMPARE(obj->property("blending").toBool(), true);
+    QCOMPARE(obj->property("meshResolution").toSize(), QSize(1, 1));
+    QCOMPARE(obj->property("visible").toBool(), true);
+
+    // Seting the values
+    QVERIFY(obj->setProperty("fragmentShader", QString(qt_default_fragment_code)));
+    QVERIFY(obj->setProperty("vertexShader", QString(qt_default_vertex_code)));
+    QVERIFY(obj->setProperty("blending", false));
+    QVERIFY(obj->setProperty("meshResolution", QSize(20, 10)));
+    QVERIFY(obj->setProperty("visible", false));
+
+    QCOMPARE(obj->property("fragmentShader").toString(), QString(qt_default_fragment_code));
+    QCOMPARE(obj->property("vertexShader").toString(), QString(qt_default_vertex_code));
+    QCOMPARE(obj->property("blending").toBool(), false);
+    QCOMPARE(obj->property("meshResolution").toSize(), QSize(20, 10));
+    QCOMPARE(obj->property("visible").toBool(), false);
+
+    delete obj;
+}
+
+void tst_qmlshadersplugin::shaderEffectSourceAPI()
+{
+    // Creation
+    QString componentStr = "import QtQuick 1.0\n"
+            "import Qt.labs.shaders 1.0\n"
+            "ShaderEffectSource {}";
+    QDeclarativeComponent shaderEffectSourceComponent(&engine);
+    shaderEffectSourceComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+
+    QObject *obj = shaderEffectSourceComponent.create();
+    QTest::qWait(100);
+    QVERIFY(obj != 0);
+
+    // Default values
+    QCOMPARE(obj->property("sourceRect").toRect(), QRect(0, 0, 0, 0));
+    QCOMPARE(obj->property("textureSize").toSize(), QSize(0, 0));
+    QCOMPARE(obj->property("live").toBool(), true);
+    QCOMPARE(obj->property("hideSource").toBool(), false);
+    QCOMPARE(obj->property("wrapMode").toUInt(), static_cast<unsigned int>(ShaderEffectSource::ClampToEdge));
+
+    // Seting the values
+    componentStr = "import QtQuick 1.0\n"
+        "Item {}";
+    QDeclarativeComponent itemComponent(&engine);
+    itemComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *> (itemComponent.create());
+    QVERIFY(item != 0);
+
+    QVERIFY(obj->setProperty("sourceItem", QVariant::fromValue(item)));
+    QVERIFY(obj->setProperty("sourceRect", QRect(10, 20, 30, 40)));
+    QVERIFY(obj->setProperty("textureSize", QSize(50, 100)));
+    QVERIFY(obj->setProperty("live", false));
+    QVERIFY(obj->setProperty("hideSource", true));
+    QVERIFY(obj->setProperty("wrapMode", static_cast<unsigned int>(ShaderEffectSource::Repeat)));
+
+    QCOMPARE(obj->property("sourceItem"), QVariant::fromValue(item));
+    QCOMPARE(obj->property("sourceRect").toRect(), QRect(10, 20, 30, 40));
+    QCOMPARE(obj->property("textureSize").toSize(), QSize(50, 100));
+    QCOMPARE(obj->property("live").toBool(), false);
+    QCOMPARE(obj->property("hideSource").toBool(), true);
+    QCOMPARE(obj->property("wrapMode").toUInt(), static_cast<unsigned int>(ShaderEffectSource::Repeat));
+
+    delete item;
+    delete obj;
+}
+
+void tst_qmlshadersplugin::combined()
+{
+    QGLFormat format = QGLFormat::defaultFormat();
+    format.setSampleBuffers(false);
+    format.setSwapInterval(1);
+
+    QGLWidget* glWidget = new QGLWidget(format);
+    glWidget->setAutoFillBackground(false);
+
+    QDeclarativeView view;
+    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    view.setAttribute(Qt::WA_OpaquePaintEvent);
+    view.setAttribute(Qt::WA_NoSystemBackground);
+    view.setViewport(glWidget);
+    view.setSource(QUrl::fromLocalFile("main.qml"));
+    view.show();
+    QTest::qWait(1000);
+
+    QObject *item = view.rootObject()->findChild<QDeclarativeItem*>("effectItem");
+    QVERIFY(item != 0);
+
+    QObject *src = view.rootObject()->findChild<QDeclarativeItem*>("effectSource");
+    QVERIFY(src != 0);
+
+    QCOMPARE(item->property("source"), QVariant::fromValue(src));
+}
+
+QTEST_MAIN(tst_qmlshadersplugin)
+
+#include "tst_qmlshadersplugin.moc"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
index bc65634..4c4d17c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
index be041d8..d7b5943 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
index 0efb20a..75a6c49 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
index 6525dbb..ae89849 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
index 5b8d209..7b7db05 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
index cf012ba..7c1442f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
index 57e77a4..c01c980 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
index 24d26bd..8806e4c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
index a540734..b331119 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
index 17da643..76e3c6f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
index e03cfe4..141753c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
index 1b808ef..8b6329d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
index 666d272..38f2051 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
index 823199c..d85498b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
index 7e84164..7547856 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
index 7e84164..84430bb 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
index 6119f92..026d06c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
index 6119f92..026d06c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
index f2e6117..16202c4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
index 2f4c84a..38b9668 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
index ae786a2..801ec2b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
index 93c16dc..ddd6cc5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
index acec1ee..4679774 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
index f380c08..51018b4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
index 18142dd..f5ed905 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
index c7f59b8..5005724 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
index be676c0..e47b479 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
index df2fe2f..0d3c672 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
index b4e1d3a..56d98ff 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
index 4177b9e..1ab1eb5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
index 36e5d35..68921f6 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
index 34f8e38..c9450c7 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
index 0b4ca4e..5049c3f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
index 251beb6..ee6e16a 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
index 5cd2d7d..d9d2252 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
index 5cd2d7d..d9d2252 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
index bf6a44e..cf99d98 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
index 1089578..e3937f0 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
index c9113de..2fe3337 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
index 47b4744..97b9913 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
index c518204..08e059f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
index 9f1c26a..bbc5ba2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
index cd8d0a5..465b64e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
index 8f5f872..d9d2252 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
index a61ba5a..61606b2 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
index 2a28c96..a4b28fc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
index d1ddaa6..5be6bbb 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
index 493c5cd..a220f65 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
index 2b2ce59..6946707 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
index 044eea4..4eeb8ec 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
index f0748b2..4eeb8ec 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
index 8d74b8d..59fc0fc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
index 8a642d2..2747b50 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
index 5698741..74efe73 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
index 7f56f34..02f6e17 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
index 8d74b8d..59fc0fc 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
index 8effaef..56f6ece 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
index 8effaef..56f6ece 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
index 8effaef..56f6ece 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
index b79af19..f8bc3b4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
index ef15fdf..e156cd5 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
index 99d451c..d624a71 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
index 5f632d0..57a1599 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
index 060be22..d327d5b 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
index d373aef..c1e3dce 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png
index 0ea21f3..7829e03 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png