Merge remote-tracking branch 'origin/4.8'

168 files changed, 7064 insertions, 309 deletions

diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 184fbb9..298c699 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -48,6 +48,7 @@
 #include <qtextstream.h>
 #include <qtextlayout.h>
 #include <qdebug.h>
+#include <QStaticText>
 
 #ifdef QT3_SUPPORT
 #include <q3painter.h>
@@ -464,6 +465,10 @@ void PaintCommands::staticInit()
                       "^drawText\\s+(-?\\w*)\\s+(-?\\w*)\\s+\"(.*)\"$",
                       "drawText <x> <y> <text>",
                       "drawText 10 10 \"my text\"");
+    DECL_PAINTCOMMAND("drawStaticText", command_drawStaticText,
+                      "^drawStaticText\\s+(-?\\w*)\\s+(-?\\w*)\\s+\"(.*)\"$",
+                      "drawStaticText <x> <y> <text>",
+                      "drawStaticText 10 10 \"my text\"");
     DECL_PAINTCOMMAND("drawTiledPixmap", command_drawTiledPixmap,
                       "^drawTiledPixmap\\s+([\\w.:\\/]*)"
                       "\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w*)\\s*(-?\\w*)"
@@ -1404,6 +1409,21 @@ void PaintCommands::command_drawText(QRegExp re)
     m_painter->drawText(x, y, txt);
 }
 
+void PaintCommands::command_drawStaticText(QRegExp re)
+{
+    if (!m_shouldDrawText)
+        return;
+    QStringList caps = re.capturedTexts();
+    int x = convertToInt(caps.at(1));
+    int y = convertToInt(caps.at(2));
+    QString txt = caps.at(3);
+
+    if (m_verboseMode)
+        printf(" -(lance) drawStaticText(%d, %d, %s)\n", x, y, qPrintable(txt));
+
+    m_painter->drawStaticText(x, y, QStaticText(txt));
+}
+
 /***************************************************************************************************/
 void PaintCommands::command_noop(QRegExp)
 {
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index 6cc0889..04492ea 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -209,6 +209,7 @@ private:
     void command_drawRoundedRect(QRegExp re);
     void command_drawRoundRect(QRegExp re);
     void command_drawText(QRegExp re);
+    void command_drawStaticText(QRegExp re);
     void command_drawTiledPixmap(QRegExp re);
     void command_path_addEllipse(QRegExp re);
     void command_path_addPolygon(QRegExp re);
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/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..a40bcc0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
@@ -0,0 +1,1341 @@
+/****************************************************************************
+**
+** 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);
+
+    // 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();
+
+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 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::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 {
+        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())));
+
+}
+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/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..19b7a76 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -2431,15 +2431,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 +2460,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..fc80b39
--- /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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+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..a904a88
--- /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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtDeclarative>
+#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
diff --git a/tests/auto/lancelot/scripts/statictext.qps b/tests/auto/lancelot/scripts/statictext.qps
new file mode 100644
index 0000000..b62b623
--- /dev/null
+++ b/tests/auto/lancelot/scripts/statictext.qps
@@ -0,0 +1,122 @@
+drawStaticText -5 5 "Text that is drawn outside the bounds..."
+
+translate 20 20
+begin_block text_drawing
+save
+  setFont "sansserif" 10 normal
+  drawStaticText 0 20 "sansserif 10pt, normal"
+
+  setFont "sansserif" 12 normal
+  drawStaticText 0 40 "sansserif 12pt, normal"
+
+  setFont "sansserif" 10 bold
+  drawStaticText 0 60 "sansserif 12pt, bold"
+
+  setFont "sansserif" 10 bold italic
+  drawStaticText 0 80 "sansserif 10pt, bold italic"
+
+
+  translate 0 100
+  setPen #7fff0000
+
+  setFont "sansserif" 10 normal
+  drawStaticText 0 20 "alpha sansserif 10pt, normal"
+
+  setFont "sansserif" 12 normal
+  drawStaticText 0 40 "alpha sansserif 12pt, normal"
+
+  setFont "sansserif" 10 bold
+  drawStaticText 0 60 "alpha sansserif 12pt, bold"
+
+  setFont "sansserif" 10 bold italic
+  drawStaticText 0 80 "alpha sansserif 10pt, bold italic"
+
+
+  translate 0 100
+  setPen black
+  save
+    scale 0.9 0.9
+
+    setFont "sansserif" 10 normal
+    drawStaticText 0 20 "scaled sansserif 10pt, normal"
+
+    setFont "sansserif" 12 normal
+    drawStaticText 0 40 "scaled sansserif 12pt, normal"
+
+    setFont "sansserif" 10 bold
+    drawStaticText 0 60 "scaled sansserif 12pt, bold"
+
+    setFont "sansserif" 10 bold italic
+    drawStaticText 0 80 "scaled sansserif 10pt, bold italic"
+  restore
+
+  translate 0 100
+  setPen black
+  save
+    translate 200 90
+    rotate 185
+
+    setFont "sansserif" 10 normal
+    drawStaticText 0 20 "scaled sansserif 10pt, normal"
+
+    setFont "sansserif" 12 normal
+    drawStaticText 0 40 "scaled sansserif 12pt, normal"
+
+    setFont "sansserif" 10 bold
+    drawStaticText 0 60 "scaled sansserif 12pt, bold"
+
+    setFont "sansserif" 10 bold italic
+    drawStaticText 0 80 "scaled sansserif 10pt, bold italic"
+  restore
+
+  translate 0 100
+  gradient_appendStop 0 red
+  gradient_appendStop 0.5 #00ff00
+  gradient_appendStop 1 blue
+  gradient_setLinear 0 0 200 0
+  setPen brush
+
+  setFont "sansserif" 10 normal
+  drawStaticText 0 0 "gradient sansserif 10pt, normal"
+
+  setFont "sansserif" 12 normal
+  drawStaticText 0 20 "gradient sansserif 12pt, normal"
+
+  setFont "sansserif" 10 bold
+  drawStaticText 0 40 "gradient sansserif 12pt, bold"
+
+  setFont "sansserif" 10 bold italic
+  drawStaticText 0 60 "gradient sansserif 10pt, bold italic"
+restore
+end_block
+
+translate 250 0
+drawStaticText 25 520 "clipped to rectangle"
+save
+  setPen #3f000000
+  setBrush nobrush
+  drawRect 20 0 100 500
+  setClipRect 20 0 100 500
+  setPen black
+  repeat_block text_drawing
+restore
+
+translate 150 0
+drawStaticText 25 520 "clipped to path"
+save
+  path_moveTo clip 20 0
+  path_cubicTo clip 0 200  40 400  20 400
+  path_lineTo clip 30 500
+  path_lineTo clip 30 0
+  path_lineTo clip 40 0
+  path_lineTo clip 40 500
+  path_lineTo clip 120 500
+  path_lineTo clip 120 0
+  path_lineTo clip 20 0
+  setPen #3f000000
+  setBrush nobrush
+  drawPath clip
+  setClipPath clip
+  setPen black
+  repeat_block text_drawing
+restore
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 92e3a8b..109afbc 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -238,6 +238,7 @@ private slots:
     void navigateControllers();
     void navigateLabels();
     void text();
+    void textAttributes();
     void setText();
     void hideShowTest();
 
@@ -1563,6 +1564,60 @@ void tst_QAccessibility::text()
 #endif // !QT3_SUPPORT
 }
 
+void tst_QAccessibility::textAttributes()
+{
+    QTextEdit textEdit;
+    int startOffset;
+    int endOffset;
+    QString attributes;
+    QString text("<html><head></head><body>"
+                 "Hello, <b>this</b> is an <i><b>example</b> text</i>."
+                 "<span style=\"font-family: monospace\">Multiple fonts are used.</span>"
+                 "Multiple <span style=\"font-size: 8pt\">text sizes</span> are used."
+                 "Let's give some color to <span style=\"color:#f0f1f2; background-color:#14f01e\">Qt</span>."
+                 "</body></html>");
+
+    textEdit.setText(text);
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&textEdit);
+
+    QAccessibleTextInterface *textInterface=interface->textInterface();
+
+    QVERIFY(textInterface);
+    QCOMPARE(textInterface->characterCount(), 112);
+
+    attributes = textInterface->attributes(10, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 7);
+    QCOMPARE(endOffset, 11);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-weight:bold;")));
+
+    attributes = textInterface->attributes(18, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 18);
+    QCOMPARE(endOffset, 25);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-weight:bold;")));
+    QVERIFY(attributes.contains(QLatin1String(";font-style:italic;")));
+
+    attributes = textInterface->attributes(34, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 31);
+    QCOMPARE(endOffset, 55);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-family:\"monospace\";")));
+
+    attributes = textInterface->attributes(65, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 64);
+    QCOMPARE(endOffset, 74);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-size:8pt;")));
+
+    attributes = textInterface->attributes(110, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 109);
+    QCOMPARE(endOffset, 111);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";background-color:rgb(20,240,30);")));
+    QVERIFY(attributes.contains(QLatin1String(";color:rgb(240,241,242);")));
+}
+
 void tst_QAccessibility::setText()
 {
 #if !defined(QT3_SUPPORT)
@@ -2645,6 +2700,8 @@ void tst_QAccessibility::textEditTest()
 {
     {
     QTextEdit edit;
+    int startOffset;
+    int endOffset;
     QString text = "hello world\nhow are you today?\n";
     edit.setText(text);
     edit.show();
@@ -2654,6 +2711,12 @@ void tst_QAccessibility::textEditTest()
     QCOMPARE(iface->childCount(), 6);
     QCOMPARE(iface->text(QAccessible::Value, 4), QString("hello world"));
     QCOMPARE(iface->text(QAccessible::Value, 5), QString("how are you today?"));
+    QCOMPARE(iface->textInterface()->textAtOffset(8, QAccessible2::WordBoundary, &startOffset, &endOffset), QString("world"));
+    QCOMPARE(startOffset, 6);
+    QCOMPARE(endOffset, 11);
+    QCOMPARE(iface->textInterface()->textAtOffset(14, QAccessible2::LineBoundary, &startOffset, &endOffset), QString("how are you today?"));
+    QCOMPARE(startOffset, 12);
+    QCOMPARE(endOffset, 30);
     QCOMPARE(iface->text(QAccessible::Value, 6), QString());
     QCOMPARE(iface->textInterface()->characterCount(), 31);
     QFontMetrics fm(edit.font());
diff --git a/tests/auto/qcomplextext/bidireorderstring.h b/tests/auto/qcomplextext/bidireorderstring.h
index e51011e..e0bbf6e 100644
--- a/tests/auto/qcomplextext/bidireorderstring.h
+++ b/tests/auto/qcomplextext/bidireorderstring.h
@@ -145,6 +145,7 @@ const LV logical_visual[] = {
     { "embed10", "\342\200\253x \327\251\327\234\327\225\327\235 y\342\200\254", "\342\200\254y \327\235\327\225\327\234\327\251 x\342\200\253", QChar::DirL },
     { "embed11", "\342\200\252x \327\251\327\234\327\225\327\235 y\342\200\254", "\342\200\252x \327\235\327\225\327\234\327\251 y\342\200\254", QChar::DirR },
     { "embed12", "\342\200\253x \327\251\327\234\327\225\327\235 y\342\200\254", "\342\200\254y \327\235\327\225\327\234\327\251 x\342\200\253", QChar::DirR },
+    { "zwsp", "+0\342\200\213f-1", "+0\342\200\213f-1", QChar::DirL },
 
     { 0, 0, 0, QChar::DirON }
 };
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index f696f19..fc3daa3 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -10,7 +10,7 @@ requires(contains(QT_CONFIG,private_tests))
 wince*|symbian: {
    addFiles.files = testdata
    addFiles.path = .
-   timesFont.files = C:/Windows/Fonts/times.ttf
+   timesFont.files = c:/windows/fonts/times.ttf
    timesFont.path = .
    DEPLOYMENT += addFiles timesFont
 }
diff --git a/tests/auto/qdatetime/qdatetime.pro b/tests/auto/qdatetime/qdatetime.pro
index a3f3091..72ca333 100644
--- a/tests/auto/qdatetime/qdatetime.pro
+++ b/tests/auto/qdatetime/qdatetime.pro
@@ -10,4 +10,3 @@ win32-msvc|win32-msvc9x {
     QMAKE_CXXFLAGS_RELEASE -= -O1
 }
 CONFIG += parallel_test
-HEADERS = tst_qdatetime.loc
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp
index cfafa78..711ffc0 100644
--- a/tests/auto/qfont/tst_qfont.cpp
+++ b/tests/auto/qfont/tst_qfont.cpp
@@ -77,6 +77,7 @@ private slots:
     void insertAndRemoveSubstitutions();
     void serializeSpacing();
     void lastResortFont();
+    void styleName();
 };
 
 // Testing get/set functions
@@ -612,5 +613,17 @@ void tst_QFont::lastResortFont()
     QVERIFY(!font.lastResortFont().isEmpty());
 }
 
+void tst_QFont::styleName()
+{
+#if !defined(Q_WS_MAC)
+    QSKIP("Only tested on Mac", SkipAll);
+#else
+    QFont font("Helvetica Neue");
+    font.setStyleName("UltraLight");
+
+    QCOMPARE(QFontInfo(font).styleName(), QString("UltraLight"));
+#endif
+}
+
 QTEST_MAIN(tst_QFont)
 #include "tst_qfont.moc"
diff --git a/tests/auto/qglyphrun/tst_qglyphrun.cpp b/tests/auto/qglyphrun/tst_qglyphrun.cpp
index 3ea84e3..a18a2ac 100644
--- a/tests/auto/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/qglyphrun/tst_qglyphrun.cpp
@@ -72,6 +72,8 @@ private slots:
     void drawUnderlinedText();
     void drawRightToLeft();
     void detach();
+    void setRawData();
+    void setRawDataAndGetAsVector();
 
 private:
     int m_testFontId;
@@ -284,6 +286,83 @@ void tst_QGlyphRun::drawExistingGlyphs()
     QCOMPARE(textLayoutDraw, drawGlyphs);
 }
 
+void tst_QGlyphRun::setRawData()
+{
+    QGlyphRun glyphRun;
+    glyphRun.setRawFont(QRawFont::fromFont(m_testFont));
+    glyphRun.setGlyphIndexes(QVector<quint32>() << 2 << 2 << 2);
+    glyphRun.setPositions(QVector<QPointF>() << QPointF(2, 3) << QPointF(20, 3) << QPointF(10, 20));
+
+    QPixmap baseline(100, 50);
+    baseline.fill(Qt::white);
+    {
+        QPainter p(&baseline);
+        p.drawGlyphRun(QPointF(3, 2), glyphRun);
+    }
+
+    QGlyphRun baselineCopied = glyphRun;
+
+    quint32 glyphIndexArray[3] = { 2, 2, 2 };
+    QPointF glyphPositionArray[3] = { QPointF(2, 3), QPointF(20, 3), QPointF(10, 20) };
+
+    glyphRun.setRawData(glyphIndexArray, glyphPositionArray, 3);
+
+    QPixmap rawDataGlyphs(100, 50);
+    rawDataGlyphs.fill(Qt::white);
+    {
+        QPainter p(&rawDataGlyphs);
+        p.drawGlyphRun(QPointF(3, 2), glyphRun);
+    }
+
+    quint32 otherGlyphIndexArray[1] = { 2 };
+    QPointF otherGlyphPositionArray[1] = { QPointF(2, 3) };
+
+    glyphRun.setRawData(otherGlyphIndexArray, otherGlyphPositionArray, 1);
+
+    QPixmap baselineCopiedPixmap(100, 50);
+    baselineCopiedPixmap.fill(Qt::white);
+    {
+        QPainter p(&baselineCopiedPixmap);
+        p.drawGlyphRun(QPointF(3, 2), baselineCopied);
+    }
+
+#if defined(DEBUG_SAVE_IMAGE)
+    baseline.save("setRawData_baseline.png");
+    rawDataGlyphs.save("setRawData_rawDataGlyphs.png");
+    baselineCopiedPixmap.save("setRawData_baselineCopiedPixmap.png");
+#endif
+
+    QCOMPARE(rawDataGlyphs, baseline);
+    QCOMPARE(baselineCopiedPixmap, baseline);
+}
+
+void tst_QGlyphRun::setRawDataAndGetAsVector()
+{
+    QVector<quint32> glyphIndexArray;
+    glyphIndexArray << 3 << 2 << 1 << 4;
+
+    QVector<QPointF> glyphPositionArray;
+    glyphPositionArray << QPointF(1, 2) << QPointF(3, 4) << QPointF(5, 6) << QPointF(7, 8);
+
+    QGlyphRun glyphRun;
+    glyphRun.setRawData(glyphIndexArray.constData(), glyphPositionArray.constData(), 4);
+
+    QVector<quint32> glyphIndexes = glyphRun.glyphIndexes();
+    QVector<QPointF> glyphPositions = glyphRun.positions();
+
+    QCOMPARE(glyphIndexes.size(), 4);
+    QCOMPARE(glyphPositions.size(), 4);
+
+    QCOMPARE(glyphIndexes, glyphIndexArray);
+    QCOMPARE(glyphPositions, glyphPositionArray);
+
+    QGlyphRun otherGlyphRun;
+    otherGlyphRun.setGlyphIndexes(glyphIndexArray);
+    otherGlyphRun.setPositions(glyphPositionArray);
+
+    QCOMPARE(glyphRun, otherGlyphRun);
+}
+
 void tst_QGlyphRun::drawNonExistentGlyphs()
 {
     QVector<quint32> glyphIndexes;
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 9b7b228..3665b10 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -6413,6 +6413,7 @@ void tst_QGraphicsItem::boundingRegion_data()
 
     QTest::newRow("(0, 0, 10, 10) | 0.0 | identity | {(0, 0, 10, 10)}") << QLineF(0, 0, 10, 10) << qreal(0.0) << QTransform()
                                                                         << QRegion(QRect(0, 0, 10, 10));
+#if 0
     {
         QRegion r;
         r += QRect(0, 0, 6, 2);
@@ -6430,6 +6431,7 @@ void tst_QGraphicsItem::boundingRegion_data()
         r += QRect(6, 9, 4, 1);
         QTest::newRow("(0, 0, 10, 10) | 1.0 | identity | {(0, 0, 10, 10)}") << QLineF(0, 0, 10, 10) << qreal(1.0) << QTransform() << r;
     }
+#endif
     QTest::newRow("(0, 0, 10, 0) | 0.0 | identity | {(0, 0, 10, 10)}") << QLineF(0, 0, 10, 0) << qreal(0.0) << QTransform()
                                                                        << QRegion(QRect(0, 0, 10, 1));
     QTest::newRow("(0, 0, 10, 0) | 0.5 | identity | {(0, 0, 10, 1)}") << QLineF(0, 0, 10, 0) << qreal(0.5) << QTransform()
@@ -8029,7 +8031,16 @@ void tst_QGraphicsItem::sorting()
     QGraphicsView view(&scene);
     view.setResizeAnchor(QGraphicsView::NoAnchor);
     view.setTransformationAnchor(QGraphicsView::NoAnchor);
+#ifdef Q_OS_SYMBIAN
+    // Adjust area in devices where scrollbars are thicker than 25 pixels as they will
+    // obstruct painting otherwise.
+    int scrollWidth = qMax(25, view.verticalScrollBar()->width());
+    int scrollHeight = qMax(25, view.horizontalScrollBar()->height());
+
+    view.resize(95 + scrollWidth, 75 + scrollHeight);
+#else
     view.resize(120, 100);
+#endif
     view.setFrameStyle(0);
     view.show();
 #ifdef Q_WS_X11
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
index d5d56fc..cd91008 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -63,6 +63,14 @@ private slots:
     void automaticReparenting();
     void verifyActivate();
     void invalidate();
+    void moveAndResize_data();
+    void moveAndResize();
+    void moveAndResizeWidgetInWidget_data();
+    void moveAndResizeWidgetInWidget();
+    void changingMinimumSize_data();
+    void changingMinimumSize();
+    void invalidateAndMove_data();
+    void invalidateAndMove();
     void constructors();
     void alternativeLayoutItems();
     void ownership();
@@ -443,7 +451,7 @@ void tst_QGraphicsLayout::invalidate()
         QCoreApplication::sendPostedEvents();
         QCOMPARE(a->eventCount(QEvent::LayoutRequest), 1);
         QCOMPARE(b->eventCount(QEvent::LayoutRequest), 0);
-        QCOMPARE(c->eventCount(QEvent::LayoutRequest), 1);
+        QCOMPARE(c->eventCount(QEvent::GraphicsSceneResize), 1);
         QCOMPARE(d->eventCount(QEvent::LayoutRequest), 0);
 
         QCOMPARE(a->functionCount[SetGeometry], 1);
@@ -479,30 +487,18 @@ void tst_QGraphicsLayout::invalidate()
 
         QCOMPARE(c->eventCount(QEvent::LayoutRequest), 0);
         QCoreApplication::sendPostedEvents();
-        QCOMPARE(a->eventCount(QEvent::LayoutRequest), 1);
+        QCOMPARE(a->eventCount(QEvent::GraphicsSceneResize), 1);
         QCOMPARE(b->eventCount(QEvent::LayoutRequest), 0);
-        QCOMPARE(c->eventCount(QEvent::LayoutRequest), 1);
+        QCOMPARE(c->eventCount(QEvent::GraphicsSceneResize), 1);
         QCOMPARE(d->eventCount(QEvent::LayoutRequest), 0);
 
         QCOMPARE(a->functionCount[SetGeometry], 1);
 
-        /* well, ideally one call to setGeometry(), but it will currently
-         * get two calls to setGeometry():
-         *   1. The first LayoutRequest will call activate() - that will call
-         *      setGeometry() on the layout. This geometry will be based on
-         *      the widget geometry which is not correct at this moment.
-         *      (it is still 150 wide)
-         *   2. Next, we check if the widget is top level, and then we call
-         *      parentWidget->resize(parentWidget->size());
-         *      This will be adjusted to be minimum 200 pixels wide.
-         *      The new size will then be propagated down to the layout
-         *
-         */
-        QCOMPARE(alay->functionCount[SetGeometry], 2);
-
-        QCOMPARE(b->functionCount[SetGeometry], 2);
-        QCOMPARE(c->functionCount[SetGeometry], 2);
-        QCOMPARE(d->functionCount[SetGeometry], 2);
+        QCOMPARE(alay->functionCount[SetGeometry], 1);
+
+        QCOMPARE(b->functionCount[SetGeometry], 1);
+        QCOMPARE(c->functionCount[SetGeometry], 1);
+        QCOMPARE(d->functionCount[SetGeometry], 1);
         // f actually got wider, need to rearrange its siblings
         QCOMPARE(blay->functionCount[SetGeometry], 1);
         QCOMPARE(clay->functionCount[SetGeometry], 1);
@@ -555,7 +551,236 @@ void tst_QGraphicsLayout::invalidate()
 
     QGraphicsLayout::setInstantInvalidatePropagation(false);
 }
+void tst_QGraphicsLayout::changingMinimumSize_data()
+{
+    QTest::addColumn<bool>("instantInvalidatePropagation");
+    QTest::newRow("Without instantInvalidatePropagation") << false;
+    QTest::newRow("With instantInvalidatePropagation") << true;
+}
+void tst_QGraphicsLayout::changingMinimumSize()
+{
+    QFETCH(bool, instantInvalidatePropagation);
+    QGraphicsLayout::setInstantInvalidatePropagation(instantInvalidatePropagation);
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    qApp->processEvents();
+    widget->setMinimumSize(300,300);
+    qApp->processEvents();
+    QCOMPARE(widget->size(), QSizeF(300,300));
+    QGraphicsLayout::setInstantInvalidatePropagation(false);
+}
+
+struct WidgetToTestResizeEvents : public QGraphicsWidget
+{
+    virtual void resizeEvent ( QGraphicsSceneResizeEvent * event )
+    {
+        QGraphicsWidget::resizeEvent(event);
+        resizeEventCalled = true;
+    }
+
+    bool resizeEventCalled;
+};
+
+void tst_QGraphicsLayout::moveAndResizeWidgetInWidget_data()
+{
+    QTest::addColumn<bool>("instantInvalidatePropagation");
+
+    QTest::newRow("Without instantInvalidatePropagation") << false;
+    QTest::newRow("With instantInvalidatePropagation") << true;
+}
+void tst_QGraphicsLayout::moveAndResizeWidgetInWidget()
+{
+    QFETCH(bool, instantInvalidatePropagation);
 
+    QGraphicsLayout::setInstantInvalidatePropagation(instantInvalidatePropagation);
+    QGraphicsScene scene;
+
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(widget);
+    layout->setContentsMargins(0,0,0,0);
+    WidgetToTestResizeEvents *innerWidget = new WidgetToTestResizeEvents;
+    QGraphicsLinearLayout *innerLayout = new QGraphicsLinearLayout(innerWidget);
+    innerLayout->setContentsMargins(0,0,0,0);
+    QCOMPARE(widget->maximumSize(), QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
+    layout->addItem(innerWidget);
+    widget->setMinimumSize(1,1);
+    widget->setPreferredSize(1000,1000);
+    widget->setMaximumSize(2000,2000);
+    widget->resize(widget->preferredSize());
+    innerWidget->setMinimumSize(1,1);
+    qApp->processEvents();
+    innerWidget->resizeEventCalled = false;
+
+    QCOMPARE(widget->size(), QSizeF(1000, 1000));
+    QCOMPARE(layout->geometry().size(), QSizeF(1000, 1000));
+    QCOMPARE(innerWidget->size(), QSizeF(1000, 1000));
+
+    innerLayout->invalidate();
+    widget->setMaximumHeight(500);
+    widget->setX(1);
+    qApp->processEvents();
+    QCOMPARE(widget->size(), QSizeF(1000, 500));
+    QCOMPARE(innerWidget->size(), QSizeF(1000, 500));
+    QVERIFY(innerWidget->resizeEventCalled);
+}
+void tst_QGraphicsLayout::moveAndResize_data()
+{
+    QTest::addColumn<bool>("instantInvalidatePropagation");
+    QTest::addColumn<bool>("insideLayout");
+    QTest::addColumn<bool>("insideLayoutInLayout");
+    QTest::addColumn<bool>("insideWidget");
+    QTest::newRow("Without instantInvalidatePropagation") << false << false << false << false;
+    QTest::newRow("With instantInvalidatePropagation") << true << false << false << false;
+    QTest::newRow("Without instantInvalidatePropagation, inside widget with no layout") << false << false << false << true;
+    QTest::newRow("With instantInvalidatePropagation, inside widget with no layout") << true << false << false << true;
+    QTest::newRow("Without instantInvalidatePropagation, inside widget with layout") << false << true << false << true;
+    QTest::newRow("With instantInvalidatePropagation, inside widget with layout") << true << true << false << true;
+    QTest::newRow("Without instantInvalidatePropagation, inside widget with layout in layout") << false << true << true << true;
+    QTest::newRow("With instantInvalidatePropagation, inside widget with layout in layout") << true << true << true << true;
+
+}
+void tst_QGraphicsLayout::moveAndResize()
+{
+    QFETCH(bool, instantInvalidatePropagation);
+    QFETCH(bool, insideLayout);
+    QFETCH(bool, insideLayoutInLayout);
+    QFETCH(bool, insideWidget);
+    QGraphicsLayout::setInstantInvalidatePropagation(instantInvalidatePropagation);
+    QGraphicsScene scene;
+
+    WidgetToTestResizeEvents *widget = new WidgetToTestResizeEvents;
+
+    /* Setup its parent if we want them */
+    QGraphicsWidget *parent = NULL;
+    if (insideWidget)
+        parent = new QGraphicsWidget;
+    if (insideLayout) {
+        QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(parent);
+        QGraphicsLinearLayout *innerLayout = NULL;
+        if (insideLayoutInLayout) {
+            innerLayout = new QGraphicsLinearLayout;
+            layout->addItem(innerLayout);
+            innerLayout->addItem(widget);
+        } else
+            layout->addItem(widget);
+    } else if (insideWidget) {
+        widget->setParentItem(parent);
+    }
+
+    new QGraphicsLinearLayout(widget);
+    widget->setGeometry(0,0,100,100);
+    qApp->processEvents();
+    widget->resizeEventCalled = false;
+
+    /* Force it grow by changing the minimum size */
+    widget->setMinimumSize(200,200);
+    qApp->processEvents();
+    qApp->processEvents();
+    qApp->processEvents();
+    QCOMPARE(widget->size(), QSizeF(200,200));
+    QVERIFY(widget->resizeEventCalled);
+    widget->resizeEventCalled = false;
+
+    /* Call setPos followed by a resize.  We should get a resize event */
+    widget->setPos(10,10);
+    widget->resize(300,300);
+    qApp->processEvents();
+    QVERIFY(widget->resizeEventCalled);
+    widget->resizeEventCalled = false;
+
+    /* Check that just calling setGeometry gives us a resize event */
+    widget->setGeometry(10,10, 400, 400);
+    qApp->processEvents();
+    QVERIFY(widget->resizeEventCalled);
+    widget->resizeEventCalled = false;
+
+    /* Now call setPos followed by increasing the size using setGeometry,*/
+    widget->setPos(30,30);
+    widget->setGeometry(10,10, 500, 500);
+    qApp->processEvents();
+    QVERIFY(widget->resizeEventCalled);
+    widget->resizeEventCalled = false;
+
+    /* Now call setPos followed by increasing the minimum size, to force it to grow */
+    widget->setMinimumSize(600,600);
+    widget->setPos(30,30);
+    qApp->processEvents();
+    QCOMPARE(widget->size(), QSizeF(600,600));
+    QVERIFY(widget->resizeEventCalled);
+    widget->resizeEventCalled = false;
+
+    QGraphicsLayout::setInstantInvalidatePropagation(false);
+}
+void tst_QGraphicsLayout::invalidateAndMove_data()
+{
+    QTest::addColumn<bool>("instantInvalidatePropagation");
+    QTest::newRow("Without instantInvalidatePropagation") << false;
+    QTest::newRow("With instantInvalidatePropagation") << true;
+
+}
+void tst_QGraphicsLayout::invalidateAndMove()
+{
+    // Check that if we set the position of an item and invalidate its layout at the same
+    // time, the widget keeps its correct size
+    QFETCH(bool, instantInvalidatePropagation);
+    QGraphicsLayout::setInstantInvalidatePropagation(instantInvalidatePropagation);
+    QGraphicsScene scene;
+
+    QGraphicsWidget *widget = new QGraphicsWidget;
+    new QGraphicsLinearLayout(widget);
+
+    widget->setMinimumSize(1,1);
+    widget->setPreferredSize(34,34);
+    widget->setMaximumSize(100,100);
+    widget->resize(widget->preferredSize());
+
+    scene.addItem(widget);
+
+    qApp->processEvents();
+
+    /* Invalidate and reactivate.  The size should not have changed */
+    widget->layout()->invalidate();
+    widget->layout()->activate();
+
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+    qApp->processEvents();
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+
+    widget->layout()->invalidate();
+    widget->setX(1);  //Change just the position using setX
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+    qApp->processEvents();
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+
+    widget->layout()->invalidate();
+    widget->setGeometry(1,1,34,34);  //Change just the position using setGeometry
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+    qApp->processEvents();
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+
+    widget->layout()->invalidate();
+    widget->setGeometry(1,1,60,60);  //Change just the size using setGeometry
+    QCOMPARE(widget->geometry().size(), QSizeF(60,60));
+    QCOMPARE(widget->layout()->geometry().size(), QSizeF(60,60));
+    qApp->processEvents();
+    QCOMPARE(widget->geometry().size(), QSizeF(60,60));
+    QCOMPARE(widget->layout()->geometry().size(), QSizeF(60,60));
+
+    widget->layout()->invalidate();
+    widget->setGeometry(0,0,34,34); //Change the size and position using setGeometry
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+    qApp->processEvents();
+    QCOMPARE(widget->geometry().size(), widget->preferredSize());
+    QCOMPARE(widget->layout()->geometry().size(), widget->preferredSize());
+
+    QGraphicsLayout::setInstantInvalidatePropagation(false);
+}
 class Layout : public QGraphicsLayout
 {
 public:
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp
index c4d5272..a6ffea3 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/qheaderview/tst_qheaderview.cpp
@@ -565,7 +565,7 @@ void tst_QHeaderView::sectionSize()
     QFETCH(int, lastVisibleSectionSize);
     QFETCH(int, persistentSectionSize);
 
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     // We test on a device with doubled pixels. Therefore we need to specify
     // different boundaries.
     initialDefaultSize = qMax(view->minimumSectionSize(), 30);
@@ -678,6 +678,16 @@ void tst_QHeaderView::visualIndexAt()
     QFETCH(QList<int>, coordinate);
     QFETCH(QList<int>, visual);
 
+#ifdef Q_OS_SYMBIAN
+    // Some Symbian devices have larger minimum section size than what is expected.
+    // Need to do this here instead of visualIndexAt_data() as view pointer doesn't
+    // seem to be valid there.
+    int minSize = view->minimumSectionSize();
+    if (minSize > 30) {
+        coordinate.clear();
+        coordinate << -1 << 0 << minSize + 1 << (minSize * 3) + 1 << 99999;
+    }
+#endif
     view->setStretchLastSection(true);
     topLevel->show();
 
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
index 3dc5e73..feb2552 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
@@ -893,8 +893,8 @@ void tst_QLocalSocket::removeServer()
     QLocalServer server, server2;
     QVERIFY(QLocalServer::removeServer("cleanuptest"));
     QVERIFY(server.listen("cleanuptest"));
-#ifndef Q_OS_WIN
-    // on Windows, there can be several sockets listening on the same pipe
+#if !defined(Q_OS_WIN) && !defined(Q_OS_QNX)
+    // on Windows and QNX, there can be several sockets listening on the same pipe
     // on Unix, there can only be one socket instance
     QVERIFY(! server2.listen("cleanuptest"));
 #endif
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp
index 72048d9..d548a51 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/qmenubar/tst_qmenubar.cpp
@@ -515,6 +515,10 @@ void tst_QMenuBar::activatedCount_noQt3()
 #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM)
     QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll);
 #endif
+#ifdef Q_OS_SYMBIAN
+    QSKIP("On Symbian OS, native key events are needed to test menu action activation", SkipAll);
+#endif
+
     // create a popup menu with menu items set the accelerators later...
     initSimpleMenubar_noQt3();
 
@@ -1573,6 +1577,12 @@ void tst_QMenuBar::task256322_highlight()
     file2->setText("file2");
     QAction *nothing = win.menuBar()->addAction("nothing");
 
+#ifdef Q_WS_S60
+    // Set minimum width to ensure that menu items are not added to the menu extension.
+    // Minimum width 360 is the minimal screen width in any supported Symbian device.
+    win.menuBar()->setMinimumWidth(360);
+#endif
+
     win.show();
     QTest::qWait(200);
 
diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
index d29ef77..57bf583 100644
--- a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ b/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
@@ -62,7 +62,6 @@ public slots:
     void cleanup();
 
 private slots:
-    void usedInThread(); // this test must be first, or it will falsely pass
     void allConfigurations();
     void defaultConfiguration();
     void configurationFromIdentifier();
@@ -330,49 +329,6 @@ void tst_QNetworkConfigurationManager::configurationFromIdentifier()
     QVERIFY(!invalid.isValid());
 }
 
-class QNCMTestThread : public QThread
-{
-protected:
-    virtual void run()
-    {
-        QNetworkConfigurationManager manager;
-        preScanConfigs = manager.allConfigurations();
-        QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-        manager.updateConfigurations(); //initiate scans
-        QTRY_VERIFY(spy.count() == 1); //wait for scan to complete
-        configs = manager.allConfigurations();
-    }
-public:
-    QList<QNetworkConfiguration> configs;
-    QList<QNetworkConfiguration> preScanConfigs;
-};
-
-// regression test for QTBUG-18795
-void tst_QNetworkConfigurationManager::usedInThread()
-{
-#if defined Q_OS_MAC && !defined (QT_NO_COREWLAN)
-    QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken", SkipAll);
-#else
-    QNCMTestThread thread;
-    connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    thread.start();
-    QTestEventLoop::instance().enterLoop(100); //QTRY_VERIFY could take ~90 seconds to time out in the thread
-    QVERIFY(!QTestEventLoop::instance().timeout());
-    qDebug() << "prescan:" << thread.preScanConfigs.count();
-    qDebug() << "postscan:" << thread.configs.count();
-
-    QNetworkConfigurationManager manager;
-    QList<QNetworkConfiguration> preScanConfigs = manager.allConfigurations();
-    QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
-    manager.updateConfigurations(); //initiate scans
-    QTRY_VERIFY(spy.count() == 1); //wait for scan to complete
-    QList<QNetworkConfiguration> configs = manager.allConfigurations();
-    QCOMPARE(thread.configs, configs);
-    //Don't compare pre scan configs, because these may be cached and therefore give different results
-    //which makes the test unstable.  The post scan results should have all configurations every time
-    //QCOMPARE(thread.preScanConfigs, preScanConfigs);
-#endif
-}
 
 QTEST_MAIN(tst_QNetworkConfigurationManager)
 #include "tst_qnetworkconfigurationmanager.moc"
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 1b4256b..d1c376a 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -52,6 +52,7 @@ private slots:
     void getterSetter();
     void setCookiesFromUrl_data();
     void setCookiesFromUrl();
+    void setCookiesFromUrl_50CookiesLimitPerDomain();
     void cookiesForUrl_data();
     void cookiesForUrl();
     void effectiveTLDs_data();
@@ -251,6 +252,46 @@ void tst_QNetworkCookieJar::setCookiesFromUrl()
     QVERIFY2(result.isEmpty(), QTest::toString(result));
 }
 
+static bool findCookieName(const QList<QNetworkCookie> &cookieList, const QString &name)
+{
+    foreach(QNetworkCookie cookie, cookieList)
+        if (cookie.name() == name)
+            return true;
+    return false;
+}
+
+void tst_QNetworkCookieJar::setCookiesFromUrl_50CookiesLimitPerDomain()
+{
+    QNetworkCookie cookie;
+    cookie.setValue("value");
+    MyCookieJar jar;
+    QUrl url("http://a.b.c.com");
+
+    for (int i = 0; i < 20; ++i) {
+        // Add a list of 3 domain-matched cookies on each iteration for a total of 60 cookies.
+        QList<QNetworkCookie> cookieList;
+        cookie.setName(QString("CookieNo%1").arg(i*3+1).toAscii());
+        cookie.setDomain("a.b.c.com");
+        cookieList += cookie;
+        cookie.setName(QString("CookieNo%1").arg(i*3+2).toAscii());
+        cookie.setDomain(".b.c.com");
+        cookieList += cookie;
+        cookie.setName(QString("CookieNo%1").arg(i*3+3).toAscii());
+        cookie.setDomain(".c.com");
+        cookieList += cookie;
+        jar.setCookiesFromUrl(cookieList, url);
+
+        int expectedNumCookies = std::min((i+1)*3, 50);
+        QCOMPARE(jar.allCookies().size(), expectedNumCookies);
+    }
+
+    // Verify that the oldest cookies were the ones overwritten.
+    QVERIFY(!findCookieName(jar.allCookies(), "CookieNo1"));
+    QVERIFY(!findCookieName(jar.allCookies(), "CookieNo10"));
+    QVERIFY(findCookieName(jar.allCookies(), "CookieNo11"));
+    QVERIFY(findCookieName(jar.allCookies(), "CookieNo60"));
+}
+
 void tst_QNetworkCookieJar::cookiesForUrl_data()
 {
     QTest::addColumn<QList<QNetworkCookie> >("allCookies");
diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 136d4d8..45464ca 100644
--- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -41,12 +41,10 @@
 
 
 #include <QtTest/QTest>
-#include <QtTest/QTestEventLoop>
 
 #include <qcoreapplication.h>
 #include <qdebug.h>
 #include <qnetworkproxy.h>
-#include <QThread>
 #include <QNetworkConfiguration>
 #include <QNetworkConfigurationManager>
 #include <QNetworkSession>
@@ -78,7 +76,6 @@ public:
     };
 
 private slots:
-    void systemProxyForQueryCalledFromThread();
     void systemProxyForQuery() const;
 #ifndef QT_NO_BEARERMANAGEMENT
     void fromConfigurations();
@@ -138,32 +135,6 @@ void tst_QNetworkProxyFactory::systemProxyForQuery() const
         QFAIL("One or more system proxy lookup failures occurred.");
 }
 
-class QSPFQThread : public QThread
-{
-protected:
-    virtual void run()
-    {
-        proxies = QNetworkProxyFactory::systemProxyForQuery(query);
-    }
-public:
-    QNetworkProxyQuery query;
-    QList<QNetworkProxy> proxies;
-};
-
-//regression test for QTBUG-18799
-void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread()
-{
-    QUrl url(QLatin1String("http://qt.nokia.com"));
-    QNetworkProxyQuery query(url);
-    QSPFQThread thread;
-    thread.query = query;
-    connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    thread.start();
-    QTestEventLoop::instance().enterLoop(5);
-    QVERIFY(thread.isFinished());
-    QCOMPARE(thread.proxies, QNetworkProxyFactory::systemProxyForQuery(query));
-}
-
 #ifndef QT_NO_BEARERMANAGEMENT
 
 //Purpose of this test is just to check systemProxyForQuery doesn't hang or crash
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 501074f..948d14a 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -1315,7 +1315,7 @@ void tst_QPainter::drawRect2()
         p.end();
 
         QRect stroke = getPaintedSize(image, Qt::white);
-        QCOMPARE(stroke, fill.adjusted(0, 0, 1, 1));
+        QCOMPARE(stroke.adjusted(1, 1, 0, 0), fill.adjusted(0, 0, 1, 1));
     }
 }
 
@@ -1412,13 +1412,13 @@ void tst_QPainter::drawPath_data()
     {
         QPainterPath p;
         p.addRect(2.25, 2.25, 10, 10);
-        QTest::newRow("non-aligned rect") << p << QRect(2, 2, 10, 10) << 10 * 10;
+        QTest::newRow("non-aligned rect") << p << QRect(3, 3, 10, 10) << 10 * 10;
     }
 
     {
         QPainterPath p;
         p.addRect(2.25, 2.25, 10.5, 10.5);
-        QTest::newRow("non-aligned rect 2") << p << QRect(2, 2, 11, 11) << 11 * 11;
+        QTest::newRow("non-aligned rect 2") << p << QRect(3, 3, 10, 10) << 10 * 10;
     }
 
     {
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
index 76dbd48..d2d92a5 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -219,7 +219,7 @@ void tst_QPluginLoader::errorString()
     QVERIFY(loader.errorString() != unknown);
     }
 
-#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN
+#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_HPUX && !defined Q_OS_SYMBIAN && !defined Q_OS_QNX
     {
     QPluginLoader loader( sys_qualifiedLibraryName("almostplugin"));     //a plugin with unresolved symbols
     loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 29845d9..e14c9db 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -361,7 +361,7 @@ bool tst_QStaticText::supportsTransformations() const
     QPaintEngine::Type type = engine->type();
 
     if (type == QPaintEngine::OpenGL
-#if !defined(Q_WS_WIN) && !defined(Q_WS_X11)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_X11) && !defined(Q_WS_MAC)
         || type == QPaintEngine::Raster
 #endif
         )
@@ -601,7 +601,7 @@ void tst_QStaticText::setPenPlainText()
 
         QStaticText staticText("XXXXX");
         staticText.setTextFormat(Qt::PlainText);
-        p.drawStaticText(0, fm.ascent(), staticText);
+        p.drawStaticText(0, 0, staticText);
     }
 
     QImage img = image.toImage();
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index c19b168..b26121c 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -3475,6 +3475,10 @@ void tst_QString::toLatin1Roundtrip_data()
 
     static const ushort unicode6[] = { 0x180, 0x1ff, 0x8001, 0x8080, 0xfffc };
     QTest::newRow("non-latin1b") << QByteArray("?????") << QString::fromUtf16(unicode6, 5) << questionmarks;
+
+    static const ushort unicode7[] = { 'H', 'e', 'l', 'l', 'o', 0x100, 0x17f, 0x180, 0x8080, 0xfffc };
+    static const ushort unicode7q[] = { 'H', 'e', 'l', 'l', 'o', '?', '?', '?', '?', '?' };
+    QTest::newRow("mixed") << QByteArray("Hello?????") << QString::fromUtf16(unicode7, 10) << QString::fromUtf16(unicode7q, 10);
 }
 
 void tst_QString::toLatin1Roundtrip()
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index 1129219..c98a703 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -182,6 +182,8 @@ private slots:
 
     void copiedFontSize();
 
+    void htmlExportImportBlockCount();
+
 private:
     void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
 
@@ -1582,7 +1584,7 @@ void tst_QTextDocument::toHtml()
 
     expectedOutput.replace("OPENDEFAULTBLOCKSTYLE", "style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;");
     expectedOutput.replace("DEFAULTBLOCKSTYLE", "style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"");
-    expectedOutput.replace("EMPTYBLOCK", "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p>\n");
+    expectedOutput.replace("EMPTYBLOCK", "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n");
     if (expectedOutput.endsWith(QLatin1Char('\n')))
         expectedOutput.chop(1);
     expectedOutput.append(htmlTail);
@@ -2760,5 +2762,27 @@ void tst_QTextDocument::copiedFontSize()
     QCOMPARE(cursorOutput.charFormat().font().pixelSize(), 24);
 }
 
+void tst_QTextDocument::htmlExportImportBlockCount()
+{
+    QTextDocument document;
+    {
+        QTextCursor cursor(&document);
+        cursor.insertText("Foo");
+        cursor.insertBlock();
+        cursor.insertBlock();
+        cursor.insertBlock();
+        cursor.insertBlock();
+        cursor.insertText("Bar");
+    }
+
+    QCOMPARE(document.blockCount(), 5);
+    QString html = document.toHtml();
+
+    document.clear();
+    document.setHtml(html);
+
+    QCOMPARE(document.blockCount(), 5);
+}
+
 QTEST_MAIN(tst_QTextDocument)
 #include "tst_qtextdocument.moc"
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index b6adc2b..2414ab3 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -127,6 +127,8 @@ private slots:
     void textWithSurrogates_qtbug15679();
     void textWidthWithStackedTextEngine();
     void textWidthWithLineSeparator();
+    void cursorInLigatureWithMultipleLines();
+    void xToCursorForLigatures();
 
 private:
     QFont testFont;
@@ -1460,5 +1462,45 @@ void tst_QTextLayout::textWidthWithLineSeparator()
     QCOMPARE(line1.naturalTextWidth(), line2.naturalTextWidth());
 }
 
+void tst_QTextLayout::cursorInLigatureWithMultipleLines()
+{
+#if !defined(Q_WS_MAC)
+    QSKIP("This test can not be run on Mac", SkipAll);
+#endif
+    QTextLayout layout("first line finish", QFont("Times", 20));
+    layout.beginLayout();
+    QTextLine line = layout.createLine();
+    line.setLineWidth(70);
+    line = layout.createLine();
+    layout.endLayout();
+
+    // The second line will be "finish", with "fi" as a ligature
+    QVERIFY(line.cursorToX(0) != line.cursorToX(1));
+}
+
+void tst_QTextLayout::xToCursorForLigatures()
+{
+#if !defined(Q_WS_MAC)
+    QSKIP("This test can not be run on Mac", SkipAll);
+#endif
+    QTextLayout layout("fi", QFont("Times", 20));
+    layout.beginLayout();
+    QTextLine line = layout.createLine();
+    layout.endLayout();
+
+    QVERIFY(line.xToCursor(0) != line.xToCursor(line.naturalTextWidth() / 2));
+
+    // U+0061 U+0308
+    QTextLayout layout2(QString::fromUtf8("\x61\xCC\x88"), QFont("Times", 20));
+
+    layout2.beginLayout();
+    line = layout2.createLine();
+    layout2.endLayout();
+
+    qreal width = line.naturalTextWidth();
+    QVERIFY(line.xToCursor(0) == line.xToCursor(width / 2) ||
+            line.xToCursor(width) == line.xToCursor(width / 2));
+}
+
 QTEST_MAIN(tst_QTextLayout)
 #include "tst_qtextlayout.moc"
diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
index 427a505..a4aa312 100644
--- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
@@ -231,7 +231,7 @@ void tst_QToolButton::task176137_autoRepeatOfAction()
 
 void tst_QToolButton::sendMouseClick()
 {
-    QTest::mouseClick(w, Qt::LeftButton, 0, QPoint(7,7));
+    QTest::mouseClick(w, Qt::LeftButton, 0);
 }
 
 QTEST_MAIN(tst_QToolButton)
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index dc878c4..7d2cdfb 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -50,6 +50,8 @@
 #include <qlineedit.h>
 #include <QScrollBar>
 #include <QStyledItemDelegate>
+#include <QDesktopWidget>
+#include <QApplication>
 
 #include "../../shared/util.h"
 
@@ -3102,10 +3104,21 @@ void tst_QTreeWidget::task206367_duplication()
     QWidget topLevel;
     QTreeWidget treeWidget(&topLevel);
     topLevel.show();
+#ifndef Q_WS_S60
     treeWidget.resize(200, 200);
+#endif
 
     treeWidget.setSortingEnabled(true);
     QTreeWidgetItem* rootItem = new QTreeWidgetItem( &treeWidget, QStringList("root") );
+#ifdef Q_WS_S60
+    // Ensure that eight items fit into tree widget. In Symbian VGA devices 8 rows of
+    // data will take more than 200 pixels.
+    int calculatedHeight = treeWidget.visualItemRect(treeWidget.topLevelItem(0)).height() +
+        2 * QApplication::style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, 0);
+    calculatedHeight *= 8; // eight 'rows': header, root and 2 items with 2 children
+    treeWidget.resize(200, qMax(200, calculatedHeight));
+#endif
+
     for (int nFile = 0; nFile < 2; nFile++ )  {
         QTreeWidgetItem* itemFile = new QTreeWidgetItem(rootItem, QStringList(QString::number(nFile)));
         for (int nRecord = 0; nRecord < 2; nRecord++)
@@ -3211,6 +3224,13 @@ void tst_QTreeWidget::task239150_editorWidth()
 {
     //we check that an item with no text will get an editor with a correct size
     QTreeWidget tree;
+#ifdef Q_OS_SYMBIAN
+    //By default widgets are 640*360 in Symbian. Call to create_sys() sets the real size of the widget.
+    //Therefore, with VGA Symbian devices, we need to update the widget width to match screen width.
+    //As VGA devices have larger font, longer texts wouldn't otherwise fit into tree widget.
+    if (QApplication::desktop() && QApplication::desktop()->availableGeometry().width() > tree.width())
+        tree.resize(QApplication::desktop()->availableGeometry().size());
+#endif
 
     QStyleOptionFrameV2 opt;
     opt.init(&tree);
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 5550fe8..86773ad 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -71,6 +71,7 @@
 #include <QtGui/qpaintengine.h>
 #include <private/qbackingstore_p.h>
 #include <qmenubar.h>
+#include <qtableview.h>
 
 #include <QtGui/QGraphicsView>
 #include <QtGui/QGraphicsProxyWidget>
@@ -406,6 +407,7 @@ private slots:
     void childAt();
 #ifdef Q_WS_MAC
     void childAt_unifiedToolBar();
+    void taskQTBUG_17333_ResizeInfiniteRecursion();
 #ifdef QT_MAC_USE_COCOA
     void taskQTBUG_11373();
 #endif // QT_MAC_USE_COCOA
@@ -10572,6 +10574,18 @@ void tst_QWidget::childAt_unifiedToolBar()
     QCOMPARE(mainWindow.childAt(labelTopLeft), static_cast<QWidget *>(label));
 }
 
+void tst_QWidget::taskQTBUG_17333_ResizeInfiniteRecursion()
+{
+    QTableView tb;
+    const char *s = "border: 1px solid;";
+    tb.setStyleSheet(s);
+    tb.show();
+
+    QTest::qWaitForWindowShown(&tb);
+    tb.setGeometry(QRect(100, 100, 0, 100));
+    // No crash, it works.
+}
+
 #ifdef QT_MAC_USE_COCOA
 void tst_QWidget::taskQTBUG_11373()
 {
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index cb02a35..73e40b2 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -10,6 +10,6 @@ SUBDIRS += \
            script \
            qmltime
 
-contains(QT_CONFIG, opengl): SUBDIRS += painting
+contains(QT_CONFIG, opengl): SUBDIRS += painting qmlshadersplugin
 
 include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/GaussianBlur.qml b/tests/benchmarks/declarative/qmlshadersplugin/GaussianBlur.qml
new file mode 100644
index 0000000..ee4c029
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/GaussianBlur.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: gaussianBlur
+    property variant source: 0
+    property real radius: 8;
+    property real deviation: Math.sqrt(-((radius+1) * (radius+1)) / (2 * Math.log(1.0 / 255.0)))
+    property bool live: true
+
+    ShaderEffectItem {
+        id: cache
+        anchors.fill: parent
+        visible: !gaussianBlur.live
+        property variant source: ShaderEffectSource { sourceItem: verticalBlur; live: false; hideSource: true }
+    }
+
+    GaussianDirectionalBlur {
+        id: verticalBlur
+        anchors.fill: parent
+
+        deltaX: 0.0
+        deltaY: 1.0/parent.height
+
+        source: ShaderEffectSource { sourceItem: horizontalBlur; hideSource: true }
+        deviation: gaussianBlur.deviation
+        radius: gaussianBlur.radius
+    }
+
+    GaussianDirectionalBlur {
+        id: horizontalBlur
+        anchors.fill: parent
+        blending: false
+
+        deltaX: 1.0/parent.width
+        deltaY: 0.0
+
+        source: gaussianBlur.source
+        deviation: gaussianBlur.deviation
+        radius: gaussianBlur.radius
+    }
+
+}
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/GaussianDirectionalBlur.qml b/tests/benchmarks/declarative/qmlshadersplugin/GaussianDirectionalBlur.qml
new file mode 100644
index 0000000..e09dde2
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/GaussianDirectionalBlur.qml
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+// Note 1. This shader implements gaussian blur without dynamic array access from inside shader loops (Optional feature in OpenGLES 2.0).
+// Note 2. Shader code is generated to avoid ecessive if-else structure in fragment shader. Code re-generation (very slow!) happens if blur radius is changed.
+
+ShaderEffectItem {
+    id: effect
+    property variant source: 0
+    property real deviation: Math.sqrt(-((radius+1) * (radius+1)) / (2 * Math.log(1.0 / 255.0)));
+    property real radius: 8;
+    property real deltaX: 0.0
+    property real deltaY: 0.0
+
+    property real gaussianSum: 0.0
+    property real startIndex: 0.0
+    property real samples: radius * 2
+
+    property variant gwts: []
+    property variant delta: Qt.vector3d(effect.deltaX, effect.deltaY, effect.startIndex);
+    property variant factor_0_2: Qt.vector3d(effect.gwts[0], effect.gwts[1], effect.gwts[2]);
+    property variant factor_3_5: Qt.vector3d(effect.gwts[3],effect.gwts[4],effect.gwts[5]);
+    property variant factor_6_8: Qt.vector3d(effect.gwts[6],effect.gwts[7],effect.gwts[8]);
+    property variant factor_9_11: Qt.vector3d(effect.gwts[9],effect.gwts[10],effect.gwts[11]);
+    property variant factor_12_14: Qt.vector3d(effect.gwts[12],effect.gwts[13],effect.gwts[14]);
+    property variant factor_15_17: Qt.vector3d(effect.gwts[15],effect.gwts[16],effect.gwts[17]);
+    property variant factor_18_20: Qt.vector3d(effect.gwts[18],effect.gwts[19],effect.gwts[20]);
+    property variant factor_21_23: Qt.vector3d(effect.gwts[21],effect.gwts[22],effect.gwts[23]);
+    property variant factor_24_26: Qt.vector3d(effect.gwts[24],effect.gwts[25],effect.gwts[26]);
+    property variant factor_27_29: Qt.vector3d(effect.gwts[27],effect.gwts[28],effect.gwts[29]);
+    property variant factor_30_32: Qt.vector3d(effect.gwts[30],effect.gwts[31],effect.gwts[32]);
+
+    //Gaussian function = h(x):=(1/sqrt(2*3.14159*(D^2))) * %e^(-(x^2)/(2*(D^2)));
+    function gausFunc(x){
+        return (1/Math.sqrt(2*3.1415926*(Math.pow(effect.deviation,2)))) * Math.pow(2.7182818,-((Math.pow(x,2))/(2*(Math.pow(effect.deviation,2)))));
+    }
+
+    function calcGWTS() {
+        var n = new Array(Math.floor(effect.samples));
+        var step
+        for (var i = 0; i < effect.samples; i++) {
+            step = -effect.samples/2 + i + 0.5
+            n[i] = gausFunc(step);
+        }
+        return n;
+    }
+
+    function buildFragmentShader() {
+
+        var shaderSteps = [
+            "gl_FragColor += texture2D(source, texCoord) * factor_0_2.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_0_2.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_0_2.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_3_5.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_3_5.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_3_5.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_6_8.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_6_8.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_6_8.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_9_11.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_9_11.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_9_11.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_12_14.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_12_14.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_12_14.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_15_17.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_15_17.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_15_17.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_18_20.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_18_20.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_18_20.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_21_23.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_21_23.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_21_23.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_24_26.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_24_26.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_24_26.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_27_29.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_27_29.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_27_29.z; texCoord += shift;",
+
+            "gl_FragColor += texture2D(source, texCoord) * factor_30_32.x; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_30_32.y; texCoord += shift;",
+            "gl_FragColor += texture2D(source, texCoord) * factor_30_32.z; texCoord += shift;"
+        ]
+
+        var shader = fragmentShader_begin
+        var samples = effect.samples
+        if (samples > 32) {
+            console.log("GaussianBlur: Maximum of 32 blur samples exceeded!")
+            samples = 32
+        }
+
+        for (var i = 0; i < samples; i++) {
+            shader += shaderSteps[i]
+        }
+
+        shader += fragmentShader_end
+        effect.fragmentShader = shader
+
+    }
+
+    onDeviationChanged:{
+        effect.startIndex = -effect.samples/2 + 0.5
+        effect.gwts = calcGWTS();
+        var sum = 0.0;
+        for (var j = 0; j < effect.samples; j++) {
+            sum += effect.gwts[j];
+        }
+        effect.gaussianSum = sum
+    }
+
+    Component.onCompleted:{
+        effect.startIndex = -effect.samples/2 + 0.5
+        effect.gwts = calcGWTS();
+        var sum = 0.0;
+        for (var j = 0; j < effect.samples; j++) {
+            sum += effect.gwts[j];
+        }
+        effect.gaussianSum = sum
+        buildFragmentShader()
+    }
+
+    onSamplesChanged: {
+        buildFragmentShader()
+    }
+
+    property string fragmentShader_begin:
+        "
+        varying mediump vec2 qt_TexCoord0;
+        uniform sampler2D source;
+        uniform highp vec3 delta;
+        uniform highp vec3 factor_0_2;
+        uniform highp vec3 factor_3_5;
+        uniform highp vec3 factor_6_8;
+        uniform highp vec3 factor_9_11;
+        uniform highp vec3 factor_12_14;
+        uniform highp vec3 factor_15_17;
+        uniform highp vec3 factor_18_20;
+        uniform highp vec3 factor_21_23;
+        uniform highp vec3 factor_24_26;
+        uniform highp vec3 factor_27_29;
+        uniform highp vec3 factor_30_32;
+        uniform highp float gaussianSum;
+
+        void main() {
+            highp vec2 shift = vec2(delta.x, delta.y);
+            highp float index = delta.z;
+            mediump vec2 texCoord = qt_TexCoord0 + (shift * index);
+            gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
+        "
+
+    property string fragmentShader_end:
+        "
+            if (gaussianSum > 0.0)
+                gl_FragColor /= gaussianSum;
+        }
+        "
+}
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/GaussianDropShadow.qml b/tests/benchmarks/declarative/qmlshadersplugin/GaussianDropShadow.qml
new file mode 100644
index 0000000..4e8c8d3
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/GaussianDropShadow.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: gaussianDropShadow
+
+    property color shadowColor: Qt.rgba(0.5, 0.5, 0.5, 1.0)
+    property variant source: 0
+    property real radius: 8
+    property real deviation: Math.sqrt(-((radius+1) * (radius+1)) / (2 * Math.log(1.0 / 255.0)))
+    property bool live: true
+
+    GaussianBlur {
+        id: blur
+        anchors.fill: parent
+        radius: gaussianDropShadow.radius
+        deviation: gaussianDropShadow.deviation
+        source: gaussianDropShadow.source
+        live: gaussianDropShadow.live
+    }
+
+    ShaderEffectItem {
+        id: shadow
+        property color shadowColor: gaussianDropShadow.shadowColor
+        property variant source: ShaderEffectSource { sourceItem: blur; hideSource: true }
+        anchors.fill: parent
+
+        fragmentShader:
+            "
+            varying mediump vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform lowp vec4 shadowColor;
+
+            void main() {
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
+                gl_FragColor = mix(vec4(0), shadowColor, sourceColor.a);
+            }
+            "
+    }
+}
+
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml
new file mode 100755
index 0000000..4831758
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: main
+    width: 360
+    height: 640
+
+    property bool liveShadows: true
+    property real r: 0
+
+    NumberAnimation on r {
+        loops: Animation.Infinite
+        from: 0
+        to: 360
+        duration: 3000
+    }
+
+    Image {
+        id: background
+        width: main.width
+        height: main.height
+        fillMode: Image.Tile
+        source: "bg.jpg"
+    }
+
+    GaussianDropShadow {
+        x: image1.x + 50
+        y: image1.y + 50
+        width: image1.width
+        height: image1.height
+        shadowColor: "#88000000"
+        source: ShaderEffectSource { sourceItem: image1; hideSource: false; sourceRect: Qt.rect(-10, -10, image1.width + 20, image1.height + 20) }
+        radius: 12.0
+        deviation: 12
+        rotation: r
+    }
+
+    Image {
+        id: image1
+        anchors.fill: parent
+        source: "drop_shadow_small.png"
+        smooth: true
+        rotation: r
+    }
+
+    GaussianDropShadow {
+        x: image2.x + 50
+        y: image2.y + 50
+        width: image2.width
+        height: image2.height
+        shadowColor: "#88000000"
+        source: ShaderEffectSource { sourceItem: image2; hideSource: false; sourceRect: Qt.rect(-10, -10, image2.width + 20, image2.height + 20) }
+        radius: 12.0
+        deviation: 12
+        rotation: -r
+    }
+
+    Image {
+        id: image2
+        anchors.fill: parent
+        source: "drop_shadow_small.png"
+        smooth: true
+        rotation: -r
+    }
+}
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml b/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml
new file mode 100755
index 0000000..c4fbc2a
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    width: 360
+    height: 640
+
+    Image {
+        id: image
+        width: parent.width
+        height: parent.height * 0.65
+        source: "sky.jpg"
+        smooth: true
+    }
+    Water {
+        sourceItem: image
+        intensity: 5
+        height: parent.height - image.height
+    }
+}
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/Water.qml b/tests/benchmarks/declarative/qmlshadersplugin/Water.qml
new file mode 100644
index 0000000..6a1ec1c
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/Water.qml
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: root
+    property alias sourceItem: effectsource.sourceItem
+    property real intensity: 1
+    property bool waving: true
+    anchors.top: sourceItem.bottom
+    width: sourceItem.width
+    height: sourceItem.height
+
+    ShaderEffectItem {
+        anchors.fill: parent
+        property variant source: effectsource
+        property real f: 0
+        property real f2: 0
+        property alias intensity: root.intensity
+        smooth: true
+
+        ShaderEffectSource {
+            id: effectsource
+            hideSource: false
+            smooth: true
+        }
+
+        fragmentShader:
+            "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform lowp float qt_Opacity;
+            uniform highp float f;
+            uniform highp float f2;
+            uniform highp float intensity;
+
+            void main() {
+                const highp float twopi = 3.141592653589 * 2.0;
+
+                highp float distanceFactorToPhase = pow(qt_TexCoord0.y + 0.5, 8.0) * 5.0;
+                highp float ofx = sin(f * twopi + distanceFactorToPhase) / 100.0;
+                highp float ofy = sin(f2 * twopi + distanceFactorToPhase * qt_TexCoord0.x) / 60.0;
+
+                highp float intensityDampingFactor = (qt_TexCoord0.x + 0.1) * (qt_TexCoord0.y + 0.2);
+                highp float distanceFactor = (1.0 - qt_TexCoord0.y) * 4.0 * intensity * intensityDampingFactor;
+
+                ofx *= distanceFactor;
+                ofy *= distanceFactor;
+
+                highp float x = qt_TexCoord0.x + ofx;
+                highp float y = 1.0 - qt_TexCoord0.y + ofy;
+
+                highp float fake = (sin((ofy + ofx) * twopi) + 0.5) * 0.05 * (1.2 - qt_TexCoord0.y) * intensity * intensityDampingFactor;
+
+                highp vec4 pix =
+                    texture2D(source, vec2(x, y)) * 0.6 +
+                    texture2D(source, vec2(x-fake, y)) * 0.15 +
+                    texture2D(source, vec2(x, y-fake)) * 0.15 +
+                    texture2D(source, vec2(x+fake, y)) * 0.15 +
+                    texture2D(source, vec2(x, y+fake)) * 0.15;
+
+                highp float darken = 0.6 - (ofx - ofy) / 2.0;
+                pix.b *= 1.2 * darken;
+                pix.r *= 0.9 * darken;
+                pix.g *= darken;
+
+                gl_FragColor = qt_Opacity * vec4(pix.r, pix.g, pix.b, 1.0);
+            }
+            "
+
+        NumberAnimation on f {
+            running: root.waving
+            loops: Animation.Infinite
+            from: 0
+            to: 1
+            duration: 2410
+        }
+        NumberAnimation on f2 {
+            running: root.waving
+            loops: Animation.Infinite
+            from: 0
+            to: 1
+            duration: 1754
+        }
+    }
+}
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/bg.jpg b/tests/benchmarks/declarative/qmlshadersplugin/bg.jpg
new file mode 100644
index 0000000..4d22143
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/bg.jpg
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png b/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png
new file mode 100755
index 0000000..4a9b283
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/drop_shadow_small.png
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/benchmarks/declarative/qmlshadersplugin/qmlshadersplugin.pro
new file mode 100644
index 0000000..c4f6925
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/qmlshadersplugin.pro
@@ -0,0 +1,23 @@
+QT += opengl declarative testlib
+
+TARGET = tst_performance
+
+SOURCES += \
+    tst_performance.cpp \
+    ../../../../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
+
+OTHER_FILES += \
+    *.qml \
+    *.png \
+    *.jpg
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/sky.jpg b/tests/benchmarks/declarative/qmlshadersplugin/sky.jpg
new file mode 100644
index 0000000..8fc19ed
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/sky.jpg
diff --git a/tests/benchmarks/declarative/qmlshadersplugin/tst_performance.cpp b/tests/benchmarks/declarative/qmlshadersplugin/tst_performance.cpp
new file mode 100644
index 0000000..728334a
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlshadersplugin/tst_performance.cpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/qtest.h>
+#include <QtDeclarative>
+#include "../../../../src/imports/shaders/shadereffectitem.h"
+#include "../../../../src/imports/shaders/shadereffectsource.h"
+//#include "../../../src/shadereffect.h"
+
+class BenchmarkItem : public QDeclarativeItem
+{
+    Q_OBJECT
+
+public:
+    BenchmarkItem( QDeclarativeItem * parent = 0 ) : QDeclarativeItem(parent)
+        , m_frameCount(0)
+    {
+        setFlag(QGraphicsItem::ItemHasNoContents, false);
+    }
+
+    void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
+        QDeclarativeItem::paint(painter, option, widget);
+        if (timer.restart() > 7) m_frameCount++;
+    }
+
+    int frameCount() { return m_frameCount; }
+
+private:
+    int m_frameCount;
+    QTime timer;
+};
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    view.setAttribute(Qt::WA_OpaquePaintEvent);
+    view.setAttribute(Qt::WA_NoSystemBackground);
+    view.setResizeMode(QDeclarativeView::SizeViewToRootObject);
+
+    qmlRegisterType<ShaderEffectItem>("Qt.labs.shaders", 1, 0, "ShaderEffectItem");
+    qmlRegisterType<ShaderEffectSource>("Qt.labs.shaders", 1, 0, "ShaderEffectSource");
+
+    QGLFormat format = QGLFormat::defaultFormat();
+    format.setSampleBuffers(false);
+    format.setSwapInterval(1);
+
+    QGLWidget* glWidget = new QGLWidget(format);
+    glWidget->setAutoFillBackground(false);
+    view.setViewport(glWidget);
+    view.show();
+
+    view.setSource(QUrl::fromLocalFile("TestWater.qml"));
+    BenchmarkItem *benchmarkItem;
+
+    qDebug() << "Sea Water benchmark:";
+    benchmarkItem = new BenchmarkItem(dynamic_cast<QDeclarativeItem *>(view.rootObject()));
+    QTest::qWait(5000);
+    qDebug() << "Rendered " << benchmarkItem->frameCount() << " frames in 5 seconds";
+    qDebug() << "Average " << benchmarkItem->frameCount() / 5.0 << " frames per second";
+
+    qDebug() << "Gaussian drop shadow benchmark:";
+    view.setSource(QUrl::fromLocalFile("TestGaussianDropShadow.qml"));
+    benchmarkItem = new BenchmarkItem(dynamic_cast<QDeclarativeItem *>(view.rootObject()));
+    QTest::qWait(5000);
+    qDebug() << "Rendered " << benchmarkItem->frameCount() << " frames in 5 seconds";
+    qDebug() << "Average " << benchmarkItem->frameCount() / 5.0 << " frames per second";
+}
+
+#include "tst_performance.moc"
diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
index e5b9346..4bdfcb7 100644
--- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
+++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
@@ -11,3 +11,5 @@ CONFIG += release
 
 # Input
 SOURCES += tst_qtcpserver.cpp
+
+symbian:TARGET.CAPABILITY += NetworkServices
\ No newline at end of file
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index f81853b..f06c4eb 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -54,6 +54,10 @@
 #include <qplatformdefs.h>
 #include <qhostinfo.h>
 
+#include <QNetworkConfiguration>
+#include <QNetworkConfigurationManager>
+#include <QNetworkSession>
+
 #include <QNetworkProxy>
 Q_DECLARE_METATYPE(QNetworkProxy)
 Q_DECLARE_METATYPE(QList<QNetworkProxy>)
@@ -75,16 +79,42 @@ public:
 public slots:
     void initTestCase_data();
     void init();
+    void initTestCase();
     void cleanup();
 private slots:
     void ipv4LoopbackPerformanceTest();
     void ipv6LoopbackPerformanceTest();
     void ipv4PerformanceTest();
+private:
+#ifndef QT_NO_BEARERMANAGEMENT
+    QNetworkConfigurationManager *netConfMan;
+    QNetworkConfiguration networkConfiguration;
+    QSharedPointer<QNetworkSession> networkSession;
+#endif
 };
 
 tst_QTcpServer::tst_QTcpServer()
 {
-    Q_SET_DEFAULT_IAP
+}
+
+void tst_QTcpServer::initTestCase()
+{
+#ifndef QT_NO_BEARERMANAGEMENT
+    netConfMan = new QNetworkConfigurationManager(this);
+    netConfMan->updateConfigurations();
+    connect(netConfMan, SIGNAL(updateCompleted()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    networkConfiguration = netConfMan->defaultConfiguration();
+    if (networkConfiguration.isValid()) {
+        networkSession = QSharedPointer<QNetworkSession>(new QNetworkSession(networkConfiguration));
+        if (!networkSession->isOpen()) {
+            networkSession->open();
+            QVERIFY(networkSession->waitForOpened(30000));
+        }
+    } else {
+        QVERIFY(!(netConfMan->capabilities() & QNetworkConfigurationManager::NetworkSessionRequired));
+    }
+#endif
 }
 
 tst_QTcpServer::~tst_QTcpServer()
@@ -98,6 +128,7 @@ void tst_QTcpServer::initTestCase_data()
 
     QTest::newRow("WithoutProxy") << false << 0;
     QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy);
+    QTest::newRow("WithHttpProxy") << true << int(QNetworkProxy::HttpProxy);
 }
 
 void tst_QTcpServer::init()
@@ -179,9 +210,6 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest()
     QSKIP("WinCE WM: Not yet supported", SkipAll);
 #endif
 
-#if defined(Q_OS_SYMBIAN)
-    QSKIP("Symbian: IPv6 is not yet supported", SkipAll);
-#endif
     QTcpServer server;
     if (!server.listen(QHostAddress::LocalHostIPv6, 0)) {
         QVERIFY(server.serverError() == QAbstractSocket::UnsupportedSocketOperationError);
@@ -236,6 +264,11 @@ void tst_QTcpServer::ipv4PerformanceTest()
     QTcpServer server;
     QVERIFY(server.listen(probeSocket.localAddress(), 0));
 
+    QFETCH_GLOBAL(int, proxyType);
+    //For http proxy, only the active connection can be proxied and not the server socket
+    if (proxyType == QNetworkProxy::HttpProxy)
+        QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128));
+
     QTcpSocket clientA;
     clientA.connectToHost(server.serverAddress(), server.serverPort());
     QVERIFY(clientA.waitForConnected(5000));
diff --git a/tests/manual/declarative/declarative.pro b/tests/manual/declarative/declarative.pro
new file mode 100644
index 0000000..337db2f
--- /dev/null
+++ b/tests/manual/declarative/declarative.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+
diff --git a/tests/manual/declarative/qmlshadersplugin/main.cpp b/tests/manual/declarative/qmlshadersplugin/main.cpp
new file mode 100644
index 0000000..3f40e92
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/main.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtOpenGL>
+#include "qmlapplicationviewer.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QGLFormat format = QGLFormat::defaultFormat();
+    format.setSampleBuffers(false);
+    format.setSwapInterval(1);
+
+    QGLWidget* glWidget = new QGLWidget(format);
+    glWidget->setAutoFillBackground(false);
+
+    QmlApplicationViewer viewer;
+    viewer.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    viewer.setViewport(glWidget);
+    viewer.setAttribute(Qt::WA_OpaquePaintEvent);
+    viewer.setAttribute(Qt::WA_NoSystemBackground);
+    viewer.setOrientation(QmlApplicationViewer::Auto);
+    viewer.setMainQmlFile(QLatin1String("qml/qmlshadersplugintest/main.qml"));
+    viewer.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestActive.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestActive.qml
new file mode 100644
index 0000000..303c7db
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestActive.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "red"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            //effect.active = !effect.active
+            effect.visible = !effect.visible
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        fragmentShader: "
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
+        }
+        "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect.visible ? "Effect active (display should be green)" : "Effect not active (display should be red)"
+             color: "white"
+             font.bold: true
+        }
+   }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml
new file mode 100644
index 0000000..b70cac0
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    anchors.fill: parent;
+
+    ShaderEffectItem {
+        anchors.fill: parent;
+        fragmentShader: "
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1);
+        }
+        "
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlending.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlending.qml
new file mode 100644
index 0000000..0c31419
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlending.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "green"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            effect.blending = !effect.blending
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        fragmentShader: "
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(1.0, 0.0, 0.0, 0.0);
+        }
+        "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect.blending ? "Effect blending (display should be orange)" : "Effect not blending (display should be red)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlendingModes.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlendingModes.qml
new file mode 100644
index 0000000..47f5bc3
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlendingModes.qml
@@ -0,0 +1,267 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: blendModeTest
+    property real blendItemHeight: 60
+
+    anchors.fill: parent;
+
+    Rectangle {
+        width: parent.width / 6
+        height: parent.height
+        color: "black"
+    }
+    Rectangle {
+        x: parent.width/6 * 1
+        width: parent.width / 6
+        height: parent.height
+        color: "white"
+    }
+    Rectangle {
+        x: parent.width/6 * 2
+        width: parent.width / 6
+        height: parent.height
+        color: "gray"
+    }
+    Rectangle {
+        x: parent.width/6 * 3
+        width: parent.width / 6
+        height: parent.height
+        color: "red"
+    }
+    Rectangle {
+        x: parent.width/6 * 4
+        width: parent.width / 6
+        height: parent.height
+        color: "green"
+    }
+    Rectangle {
+        x: parent.width/6 * 5
+        width: parent.width / 6
+        height: parent.height
+        color: "blue"
+    }
+
+
+    Image {
+        anchors.fill: parent;
+        source: "image.png"
+
+    }
+
+    Rectangle {
+        id: first
+        anchors.top: parent.top
+        anchors.topMargin: 60
+        width: parent.width
+        height: blendModeTest.blendItemHeight
+        color: "#8000ff00"
+        Text {
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 5
+            text: " Rectangle color #8000ff00"
+            color: "white"
+        }
+    }
+    Rectangle {
+        id: second
+        anchors.top: first.bottom
+        anchors.topMargin: 5
+        width: parent.width
+        height: blendModeTest.blendItemHeight
+        color: "#ff00ff00"
+        opacity: 0.5
+        Text {
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 5
+            text: " Rectangle color #ff00ff00, opacity 0.5"
+            color: "white"
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.top: second.bottom
+        anchors.topMargin: 5
+        width: parent.width
+        height: blendModeTest.blendItemHeight
+        fragmentShader: "
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(0.0, 1.0, 0.0, 0.5);
+        }
+        "
+        Text {
+             anchors.bottom: parent.bottom
+             anchors.bottomMargin: 5
+             text: " ShaderEffectItem gl_FragColor=vec4(0.0, 1.0, 0.0, 0.5)"
+             color: "white"
+        }
+    }
+
+        ShaderEffectItem {
+            id: effect2
+            anchors.top: effect.bottom
+            anchors.topMargin: 5
+            width: parent.width
+            height: blendModeTest.blendItemHeight
+            fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            void main() {
+                gl_FragColor = vec4(0.0, 0.5, 0.0, 0.5);
+            }
+                "
+                Text {
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: 5
+                    text: " ShaderEffectItem gl_FragColor=vec4(0.0, 0.5, 0.0, 0.5)"
+                    color: "white"
+                }
+        }
+
+
+     Image {
+         id: image1
+         source: "green_image_transparent.png"
+         anchors.top: effect2.bottom
+         anchors.topMargin: 5
+         width: parent.width
+         height: blendModeTest.blendItemHeight
+     }
+     Text {
+         anchors.bottom: image1.bottom
+         anchors.bottomMargin: 5
+         text: " Image, green and 50% alpha"
+         color: "white"
+     }
+
+
+     ShaderEffectItem {
+         id: effect3
+         property variant source: ShaderEffectSource {
+             sourceItem: image1
+             hideSource: false
+         }
+         anchors.top: image1.bottom
+         anchors.topMargin: 5
+
+         width: parent.width
+         height: blendModeTest.blendItemHeight
+         Text {
+             anchors.bottom: parent.bottom
+             anchors.bottomMargin: 5
+             text: " ShaderEffectItem, source item green 50% alpha."
+             color: "white"
+         }
+     }
+
+     ShaderEffectItem {
+         id: effect4
+         property variant source: ShaderEffectSource {
+             sourceItem: Image { source: "green_image_transparent.png" }
+             hideSource: true
+         }
+         anchors.top: effect3.bottom
+         anchors.topMargin: 5
+         width: parent.width
+         height: blendModeTest.blendItemHeight
+         Text {
+             anchors.bottom: parent.bottom
+             anchors.bottomMargin: 5
+             text: " ShaderEffectItem, source image green 50% alpha."
+             color: "white"
+         }
+     }
+
+
+     Rectangle {
+         id: greenRect2
+         anchors.top: effect4.bottom
+         anchors.topMargin: 5
+         width: parent.width
+         height: blendModeTest.blendItemHeight
+         opacity: 0.5
+         color: "green"
+     }
+
+
+     ShaderEffectItem {
+         id: effect5
+         property variant source: ShaderEffectSource { sourceItem: greenRect2; hideSource: true }
+         anchors.top: effect4.bottom
+         anchors.topMargin: 5
+
+         width: parent.width
+         height: blendModeTest.blendItemHeight
+         Text {
+             anchors.bottom: parent.bottom
+             anchors.bottomMargin: 5
+             text: " ShaderEffectItem, source item green rect with 0.5 opacity."
+             color: "white"
+         }
+     }
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+        }
+    }
+
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Blending test"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectHierarchy.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectHierarchy.qml
new file mode 100644
index 0000000..1cad5b1
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectHierarchy.qml
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id :root
+    anchors.fill: parent;
+    color: "green"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            effect1.visible = !effect1.visible
+            effect2.visible = !effect2.visible
+            //effect3.visible = !effect3.visible
+        }
+    }
+
+    Rectangle {
+        id: a
+        x: 90
+        y: 90
+        color: "red"
+        width: 220
+        height: 220
+        Rectangle {
+            id: b
+            x: 10
+            y: 10
+            color: "blue"
+            width: 100
+            height: 100
+            rotation: 5
+            Rectangle {
+                id: c
+                x: 10
+                y: 10
+                color: "black"
+                width: 80
+                height: 80
+            }
+        }
+        Rectangle {
+            id: d
+            x: 10
+            y: 110
+            color: "yellow"
+            width: 100
+            height: 100
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect1
+        anchors.fill: a
+        property variant source: ShaderEffectSource{ sourceItem: a; hideSource: true }
+    }
+
+    ShaderEffectItem {
+        id: effect2
+        x: 100
+        y: 100
+        width: 100
+        height: 100
+        rotation: 5
+        property variant source: ShaderEffectSource{ sourceItem: b; hideSource: true }
+    }
+
+//    ShaderEffectItem {
+//        id: effect3
+//        x: 110
+//        y: 210
+//        width: 80
+//        height: 80
+//        property variant source: ShaderEffectSource{ sourceItem: c; hideSource: true }
+//    }
+
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect1.visible ? "Effects active" : "Effects NOT active"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
new file mode 100644
index 0000000..1446f9b
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "green"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+
+        }
+    }
+
+    Rectangle {
+        id: theSource
+        color: "red"
+        anchors.centerIn: parent;
+        width: parent.width/2
+        height: parent.height/2
+    }
+
+    ShaderEffectItem {
+        id: effect1
+        anchors.fill: theSource;
+        property variant source: ShaderEffectSource{ sourceItem: theSource; hideSource: true }
+    }
+
+    ShaderEffectItem {
+        id: effect2
+        anchors.fill: effect1;
+        property variant source: effect1
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            void main(void)
+            {
+                gl_FragColor = vec4(texture2D(source, qt_TexCoord0.st).rgb, 1.0);
+            }
+        "
+    }
+
+    ShaderEffectItem {
+         id: effect3
+         x: effect2.x
+         y: effect2.y
+         width: effect2.width
+         height: effect2.height
+
+         property variant source: ShaderEffectSource { sourceItem: effect2 ; hideSource: false }
+
+         fragmentShader:
+             "
+              varying highp vec2 qt_TexCoord0;
+              uniform sampler2D source;
+              void main(void)
+                  {
+                      gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+                  }
+             "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Red rect inside green fullscreen rect."
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFormat.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFormat.qml
new file mode 100644
index 0000000..df5e06d
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFormat.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "gray"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (theSource.format == ShaderEffectSource.Alpha)
+                theSource.format = ShaderEffectSource.RGB
+            else if (theSource.format == ShaderEffectSource.RGB)
+                theSource.format = ShaderEffectSource.RGBA
+            else if (theSource.format == ShaderEffectSource.RGBA)
+                theSource.format = ShaderEffectSource.Alpha
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Source format test: " + theSource.format
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFragmentShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFragmentShader.qml
new file mode 100644
index 0000000..d170358
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFragmentShader.qml
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            effect.fragmentShader == effect.redFragmentShader ?  effect.fragmentShader = effect.greenFragmentShader :  effect.fragmentShader = effect.redFragmentShader
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+
+        property string redFragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            void main() {
+                gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+            }
+        "
+
+        property string greenFragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            void main() {
+                gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
+            }
+        "
+
+        fragmentShader: redFragmentShader
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect.fragmentShader == effect.redFragmentShader ? "Effect (display should be red)" : "Effect (display should be green)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestGrab.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestGrab.qml
new file mode 100644
index 0000000..08e9319
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestGrab.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            console.log("Grabbed!")
+            theSource.grab();
+        }
+    }
+
+    Image {
+        id: theSourcImage
+        source: "image_opaque.png"
+        opacity: 0.5
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: theSourcImage
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Effect with grab (opacity 0.5)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHideOriginal.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHideOriginal.qml
new file mode 100644
index 0000000..1cd449f
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHideOriginal.qml
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "green"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            //theSource.hideOriginal = !theSource.hideOriginal
+            theSource.hideSource = !theSource.hideSource
+        }
+    }
+
+    Rectangle {
+        id: redRect
+        anchors.fill: parent;
+        color: "red"
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: redRect
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+
+        fragmentShader: "
+        varying highp vec2 qt_TexCoord0;
+        uniform sampler2D source;
+        void main() {
+            // Empty fragmentshader, we do not write any pixels via this effect item. We only observe hideoriginal functionality.
+        }
+        "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             //text: theSource.hideOriginal ? "Hideoriginal true (display should be green)" : "Hideoriginal false (display should be red)"
+             text: theSource.hideSource ? "HideSource true (display should be green)" : "HideSource false (display should be red)"
+             color: "white"
+             font.bold: true
+        }
+   }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
new file mode 100644
index 0000000..ec372ca
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.wrapMode == ShaderEffectSource.RepeatHorizontally ? theSource.wrapMode = ShaderEffectSource.ClampToEdge : theSource.wrapMode = ShaderEffectSource.RepeatHorizontally
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image_small.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            highp vec2 tex = qt_TexCoord0 * 4.0;
+            gl_FragColor = texture2D(source, tex);
+        }
+        "
+
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.wrapMode == ShaderEffectSource.RepeatHorizontally ? "HorizontalWrap RepeatHorizontally" : "HorizontalWrap ClampToEdge"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageFiltering.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageFiltering.qml
new file mode 100644
index 0000000..9d990d0
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageFiltering.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.smooth = !theSource.smooth
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        width: parent.width * 2.0
+        height: parent.height * 2.0
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: !theSource.smooth ? "Filtering nearest (faster)" : "Filtering linear (better quality)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMargins.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMargins.qml
new file mode 100644
index 0000000..3ad2b50
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMargins.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: imageMarginTester
+    anchors.fill: parent;
+    color: "green"
+    property real testMarginX: 10
+    property real testMarginY: 10
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+
+        onTriggered: {
+            if (imageMarginTester.testMarginX < 20) {
+                imageMarginTester.testMarginX = 50
+                imageMarginTester.testMarginY = 120
+            }
+            else {
+                imageMarginTester.testMarginX = 10
+                imageMarginTester.testMarginY = 10
+            }
+
+            console.log("onTriggered...")
+            theSource.sourceRect = Qt.rect(-testMarginX, -testMarginY, parent.width + testMarginX*2, parent.height + testMarginY*2)
+            console.log("onTriggered done")
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceImage: "image_opaque.png"
+        sourceRect: Qt.rect(-10,-10, parent.width + 2*10, parent.height + 2*10)
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.sourceRect.width == 0 ? "No margins" : "Green margins " + imageMarginTester.testMarginX + "x" + imageMarginTester.testMarginY
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
new file mode 100644
index 0000000..453bbaf
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: marginTester
+    anchors.fill: parent;
+    color: "green"
+    property real testMarginX: 10
+    property real testMarginY: 10
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (marginTester.testMarginX < 20) {
+                marginTester.testMarginX = 50
+                marginTester.testMarginY = 120
+            }
+            else {
+                marginTester.testMarginX = 10
+                marginTester.testMarginY = 10
+            }
+
+            theSource.sourceRect = Qt.rect(-testMarginX, -testMarginY, parent.width + testMarginX*2, parent.height + testMarginY*2)
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceImage: "image_opaque.png"
+        textureSize: Qt.size(160,160)
+        sourceRect: Qt.rect(-10,-10, parent.width + 2*10, parent.height + 2*10)
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.sourceRect.width == 0 ? "No margins" : "Green margins " + marginTester.testMarginX + "x" + marginTester.testMarginY
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMipmap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMipmap.qml
new file mode 100644
index 0000000..a51068d
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMipmap.qml
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+                if (theSource.mipmap && theSource.smooth){
+                    theSource.smooth = false
+                } else if (theSource.mipmap && !theSource.smooth){
+                    theSource.smooth = true
+                    theSource.mipmap = false
+                } else if (!theSource.mipmap && theSource.smooth){
+                    theSource.smooth = false
+                } else if (!theSource.mipmap && !theSource.smooth){
+                    theSource.smooth = true
+                    theSource.mipmap = true
+                }
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceImage: "wallpaper.jpg"
+        mipmap: false
+        smooth: false
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.centerIn: parent;
+        width: parent.width * 0.8
+        height: parent.height * 0.8
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Mipmap: " + theSource.mipmap + ",  Smooth: " + theSource.smooth
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMargins.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMargins.qml
new file mode 100644
index 0000000..94f7824
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMargins.qml
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: marginTester
+    anchors.fill: parent;
+    color: "green"
+    property real testMarginX: 10
+    property real testMarginY: 10
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (marginTester.testMarginX < 20) {
+                marginTester.testMarginX = 50
+                marginTester.testMarginY = 120
+            }
+            else {
+                marginTester.testMarginX = 10
+                marginTester.testMarginY = 10
+            }
+
+            theSource.sourceRect = Qt.rect(-testMarginX, -testMarginY, parent.width + testMarginX*2, parent.height + testMarginY*2)
+            console.log("onTriggered")
+        }
+    }
+
+    Image {
+        id: redrect
+        source: "image_opaque.png"
+    }
+
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: redrect
+        sourceRect: Qt.rect(-10,-10, parent.width + 2*10, parent.height + 2*10)
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.sourceRect.width == 0 ? "No margins" : "Green margins " + marginTester.testMarginX + "x" + marginTester.testMarginY
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
new file mode 100644
index 0000000..83784c3
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: marginTester
+    anchors.fill: parent;
+    color: "green"
+    property real testMarginX: 10
+    property real testMarginY: 10
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (marginTester.testMarginX < 20) {
+                marginTester.testMarginX = 50
+                marginTester.testMarginY = 120
+            }
+            else {
+                marginTester.testMarginX = 10
+                marginTester.testMarginY = 10
+            }
+
+            theSource.sourceRect = Qt.rect(-testMarginX, -testMarginY, parent.width + testMarginX*2, parent.height + testMarginY*2)
+        }
+    }
+
+    Image {
+        id: redrect
+        source: "image_opaque.png"
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: redrect
+        textureSize: Qt.size(160,160)
+        sourceRect: Qt.rect(-10,-10, parent.width + 2*10, parent.height + 2*10)
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.sourceRect.width == 0 ? "No margins" : "Green margins " + marginTester.testMarginX + "x" + marginTester.testMarginY
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestLive.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestLive.qml
new file mode 100644
index 0000000..6db568d
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestLive.qml
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.live = !theSource.live
+            theSource.grab() // This tests grabbing screenshot from static source
+        }
+    }
+
+    Rectangle {
+        id: greenRect
+        anchors.fill: parent;
+        color: theSource.live ? "green" : "red" // This works if we use grab()
+        property int counter: 0
+        Text {
+            id: counterText
+            anchors.centerIn:  parent
+            text: greenRect.counter
+            font.pixelSize: 48
+        }
+        Timer {
+            running: true
+            interval: 100
+            repeat: true
+            onTriggered: {
+                greenRect.counter++
+            }
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: greenRect
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.live ? "live true (color green, number changes)" : "live false (color red, same number)"
+             color: "white"
+             font.bold: true
+        }
+   }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestMeshResolution.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestMeshResolution.qml
new file mode 100644
index 0000000..255df36
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestMeshResolution.qml
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "red"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            effect.meshResolution.width == 1 ? effect.meshResolution = Qt.size(40,40) : effect.meshResolution = Qt.size(1,1)
+        }
+    }
+
+    Rectangle {
+        id: thesource
+        anchors.centerIn: parent;
+        color: "green"
+        width: parent.width
+        height: parent.height
+        Image {
+            anchors.centerIn: parent;
+            source: "image_opaque.png"
+        }
+    }
+
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: thesource;
+        property variant source: ShaderEffectSource { sourceItem: thesource }
+
+        vertexShader: "
+           attribute highp vec4 qt_Vertex;
+           attribute highp vec2 qt_MultiTexCoord0;
+           uniform highp mat4 qt_ModelViewProjectionMatrix;
+           varying highp vec2 qt_TexCoord0;
+           void main() {
+               qt_TexCoord0 = qt_MultiTexCoord0;
+
+               highp vec4 shift = vec4(cos(1071. * qt_MultiTexCoord0.x + 1.0) + sin(2051. * qt_MultiTexCoord0.y + 1.0),
+                                       cos(1131. * qt_MultiTexCoord0.x + 1.0) + sin(3039. * qt_MultiTexCoord0.x + 1.0), 0, 0) * 3.0;
+
+               if (qt_MultiTexCoord0.x < 0.01 || qt_MultiTexCoord0.x > 0.99)
+                   shift.x = 0.;
+               if (qt_MultiTexCoord0.y < 0.01 || qt_MultiTexCoord0.y > 0.99)
+                   shift.y = 0.;
+
+               gl_Position = qt_ModelViewProjectionMatrix * (qt_Vertex + shift);
+           }
+        "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect.meshResolution.width == 1 ? "Resolution (1,1) (image looks normal)" : "Resolution (40,40) (image looks distorted)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOneSource.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOneSource.qml
new file mode 100644
index 0000000..117ae65
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOneSource.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "black"
+
+    Text {
+        id: text
+        anchors.centerIn: parent
+        font.pixelSize:  80
+        text: "Shaderz!"
+    }
+
+    ShaderEffectSource {
+        id: source
+        sourceItem: text
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        anchors.fill: text;
+
+        property variant source: source
+
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(qt_TexCoord0.x, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+        }
+        "
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOpacity.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOpacity.qml
new file mode 100644
index 0000000..00af373
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOpacity.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (effect.opacity > 0.9)
+                effect.opacity = 0.0
+            else if (effect.opacity < 0.5)
+                effect.opacity = 0.5
+            else if (effect.opacity < 0.9)
+                effect.opacity = 1.0
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image_opaque.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+        property variant source: theSource
+
+        fragmentShader: "
+        uniform highp float qt_Opacity;
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(texture2D(source, qt_TexCoord0).rgb, qt_Opacity);
+        }
+        "
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Effect with opacity: " + effect.opacity
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestRotation.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestRotation.qml
new file mode 100644
index 0000000..c4435fa
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestRotation.qml
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (effectWrapper.rotation < 45)
+                effectWrapper.rotation = 45
+            else if (effectWrapper.rotation < 90)
+                effectWrapper.rotation = 90
+            else if (effectWrapper.rotation < 180)
+                effectWrapper.rotation = 0
+
+        }
+    }
+
+    Item {
+        id: effectWrapper
+        anchors.fill: parent;
+
+        ShaderEffectSource {
+            id: theSource
+            sourceItem: Image { source: "image_opaque.png" }
+            live: false
+            hideSource: true
+        }
+
+        ShaderEffectItem {
+            id: effect
+            anchors.centerIn: parent
+            width: parent.width - 50
+            height: parent.height  - 50
+            property variant source: theSource
+        }
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Effect is rotated " + effectWrapper.rotation + " degrees"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestScale.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestScale.qml
new file mode 100644
index 0000000..3488eab
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestScale.qml
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            if (effectWrapper.scale < 0.3)
+                effectWrapper.scale = 0.3
+            else if (effectWrapper.scale < 1.7)
+                effectWrapper.scale = 1.7
+            else if (effectWrapper.scale < 2.0)
+                effectWrapper.scale = 0.1
+        }
+    }
+
+    Item {
+        id: effectWrapper
+        anchors.fill: parent;
+        scale: 0.1
+
+        ShaderEffectSource {
+            id: theSource
+            sourceItem: Image { source: "image_opaque.png" }
+            live: false
+            hideSource: true
+        }
+
+        ShaderEffectItem {
+            id: effect
+            anchors.centerIn: parent
+            width: parent.width - 50
+            height: parent.height  - 50
+            property variant source: theSource
+        }
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "Effect is scaled " + effectWrapper.scale
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTextureSize.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTextureSize.qml
new file mode 100644
index 0000000..7369efc
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTextureSize.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.textureSize.width == 64 ? theSource.textureSize = Qt.size(360,640) : theSource.textureSize = Qt.size(64,64)
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image.png" }
+        live: false
+        textureSize: Qt.size(64,64)
+        smooth: true
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: "textureSize:" + theSource.textureSize.width + "x" + theSource.textureSize.height
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
new file mode 100644
index 0000000..8098a4d
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "black"
+
+    Text {
+        id: text
+        anchors.centerIn: parent
+        font.pixelSize:  80
+        text: "Shaderz!"
+    }
+
+    ShaderEffectSource {
+        id: source
+        sourceItem: text
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        width: parent.width
+        height: parent.height / 2
+        blending: false
+
+        property variant source: source
+
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(0, qt_TexCoord0.y, 1, 1) * texture2D(source, qt_TexCoord0).a;
+        }
+        "
+    }
+
+    ShaderEffectItem {
+        width: parent.width
+        y: parent.height / 2
+        height: parent.height / 2
+
+        property variant source: source
+
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = vec4(qt_TexCoord0.x, 1, 0, 1) * texture2D(source, qt_TexCoord0).a;
+        }
+        "
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwoSources.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwoSources.qml
new file mode 100644
index 0000000..e651cd9
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwoSources.qml
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "black"
+
+    Rectangle {
+        id: rect;
+        anchors.centerIn: parent
+        width: 1
+        height: 10
+
+        gradient: Gradient {
+            GradientStop { position: 0; color: "#ff0000" }
+            GradientStop { position: 0.5; color: "#00ff00" }
+            GradientStop { position: 1; color: "#0000ff" }
+        }
+    }
+
+    Text {
+        id: text
+        anchors.centerIn: parent
+        font.pixelSize:  80
+        text: "Shaderz!"
+    }
+
+    ShaderEffectSource {
+        id: maskSource
+        sourceItem: text
+        hideSource: true
+    }
+
+    ShaderEffectSource {
+        id: colorSource
+        sourceItem: rect;
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        anchors.fill: text;
+
+        property variant colorSource: colorSource
+        property variant maskSource: maskSource;
+
+        fragmentShader: "
+        uniform lowp sampler2D maskSource;
+        uniform lowp sampler2D colorSource;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            gl_FragColor = texture2D(maskSource, qt_TexCoord0).a * texture2D(colorSource, qt_TexCoord0.yx);
+        }
+        "
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
new file mode 100644
index 0000000..4edb065
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "red"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            effect.vertexShader == effect.defaultVertexShader ?  effect.vertexShader = effect.dummyVertexShader :  effect.vertexShader = effect.defaultVertexShader
+        }
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+
+        property string defaultVertexShader: "
+            uniform highp mat4 qt_ModelViewProjectionMatrix;
+            attribute highp vec4 qt_Vertex;
+            attribute highp vec2 qt_MultiTexCoord0;
+            varying highp vec2 qt_TexCoord0;
+            void main(void)
+            {
+                qt_TexCoord0 = qt_MultiTexCoord0;
+                gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
+            }
+        "
+
+        property string dummyVertexShader: "
+            uniform highp mat4 qt_ModelViewProjectionMatrix;
+            attribute highp vec4 qt_Vertex;
+            attribute highp vec2 qt_MultiTexCoord0;
+            varying highp vec2 qt_TexCoord0;
+            void main(void)
+            {
+                 qt_TexCoord0 = qt_MultiTexCoord0;
+                 gl_Position = qt_Vertex * vec4(0.0, 0.0, 0.0, 0.0001);
+            }
+        "
+
+        vertexShader: defaultVertexShader
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            void main() {
+                 gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
+            }
+        "
+
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: effect.vertexShader == effect.defaultVertexShader ? "Effect (display shoud be green)" : "Effect (display shoud be red)"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
new file mode 100644
index 0000000..b7d6db4
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.wrapMode == ShaderEffectSource.RepeatVertically ? theSource.wrapMode = ShaderEffectSource.ClampToEdge : theSource.wrapMode = ShaderEffectSource.RepeatVertically
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image_small.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            highp vec2 tex = qt_TexCoord0 * 4.0;
+            gl_FragColor = texture2D(source, tex);
+        }
+        "
+
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.wrapMode == ShaderEffectSource.RepeatVertically ? "Wrap RepeatVertically" : "VerticalWrap ClampToEdge"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
new file mode 100644
index 0000000..e09673c
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    anchors.fill: parent;
+    color: "white"
+
+    Timer {
+        running: true
+        interval: 2000
+        repeat: true
+        onTriggered: {
+            theSource.wrapMode == ShaderEffectSource.Repeat ? theSource.wrapMode = ShaderEffectSource.ClampToEdge : theSource.wrapMode = ShaderEffectSource.Repeat
+        }
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        sourceItem: Image { source: "image_small.png" }
+        live: false
+        hideSource: true
+    }
+
+    ShaderEffectItem {
+        id: effect
+        anchors.fill: parent;
+        property variant source: theSource
+        fragmentShader: "
+        uniform lowp sampler2D source;
+        varying highp vec2 qt_TexCoord0;
+        void main() {
+            highp vec2 tex = qt_TexCoord0 * 4.0;
+            gl_FragColor = texture2D(source, tex);
+        }
+        "
+
+    }
+
+    Rectangle {
+        width: parent.width
+        height: 40
+        color: "#cc000000"
+
+        Text {
+             id: label
+             anchors.centerIn:  parent
+             text: theSource.wrapMode == ShaderEffectSource.Repeat ? "Wrap Repeat" : "Wrap ClampToEdge"
+             color: "white"
+             font.bold: true
+        }
+    }
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg
new file mode 100755
index 0000000..3005133
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/back.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+   width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="30"/>
+<path fill="#FFFFFF" d="M19,8h-9V5c0-0.389-0.225-0.74-0.576-0.906C9.289,4.031,9.145,4,9,4C8.771,4,8.543,4.079,8.359,4.231
+  l-6,5.001C2.132,9.422,2,9.703,2,10s0.132,0.578,0.359,0.768l6,5C8.543,15.921,8.771,16,9,16c0.145,0,0.289-0.031,0.424-0.094
+  C9.775,15.741,10,15.389,10,15v-3h9c2.757,0,5,2.243,5,5s-2.243,5-5,5h-6.917c-1.104,0-2,0.896-2,2s0.896,2,2,2H19
+  c4.963,0,9-4.037,9-9S23.963,8,19,8z"/>
+</svg>
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png
new file mode 100755
index 0000000..f3024f7
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/green_image_transparent.png
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png
new file mode 100755
index 0000000..144c02d
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image.png
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png
new file mode 100755
index 0000000..c73d389
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_opaque.png
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png
new file mode 100755
index 0000000..b226773
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/image_small.png
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/main.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/main.qml
new file mode 100644
index 0000000..1abf524
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/main.qml
@@ -0,0 +1,236 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Item {
+    id: main
+    width: 360
+    height: 640
+
+    Rectangle {
+        id: background
+        visible: testCaseList.visible
+        anchors.fill: parent
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#EEEEEE" }
+                 GradientStop { position: 1.0; color: "#AAAAAA" }
+             }
+    }
+
+    Loader {
+        id: testLoader
+        width: parent.width
+        height: parent.height
+        visible: !testCaseList.visible
+    }
+
+    ListModel {
+        id: testcaseModel
+        ListElement { name: "TestEffectHierarchy.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestGrab.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestLive.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestImageFiltering.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestWrapRepeat.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestHorizontalWrap.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestVerticalWrap.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestTextureSize.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestItemMargins.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestEffectInsideAnotherEffect.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestItemMarginsWithTextureSize.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestHideOriginal.qml"; group: "Effect source property tests" }
+        ListElement { name: "TestActive.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestBlending.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestBlendingModes.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestOpacity.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestFragmentShader.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestVertexShader.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestMeshResolution.qml"; group: "Effect item property tests" }
+        ListElement { name: "TestRotation.qml"; group: "Shader effect transformation tests" }
+        ListElement { name: "TestScale.qml"; group: "Shader effect transformation tests" }
+        ListElement { name: "TestBasic.qml"; group: "Scenegraph effect tests" }
+        ListElement { name: "TestOneSource.qml"; group: "Scenegraph effect tests" }
+        ListElement { name: "TestTwiceOnSameSource.qml"; group: "Scenegraph effect tests" }
+        ListElement { name: "TestTwoSources.qml"; group: "Scenegraph effect tests" }
+    }
+
+    Component {
+        id: sectionHeading
+        Rectangle {
+            width: testCaseList.width
+            height: 35
+            color: "#00000000"
+
+            Text {
+                text: section
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignLeft
+                anchors.fill: parent
+                anchors.leftMargin: 5
+                font.bold: true
+                style: Text.Raised
+                styleColor: "white"
+            }
+        }
+    }
+
+    ListView {
+        id: testCaseList
+
+        property int hideTranslation: 0
+        transform: Translate {
+            x: testCaseList.hideTranslation
+        }
+
+        anchors.fill: parent
+        anchors.topMargin: 10
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5
+        anchors.bottomMargin: 10
+
+        model: testcaseModel
+        spacing: 3
+
+        state: "testStopped"
+
+        section.property: "group"
+        section.criteria: ViewSection.FullString
+        section.delegate: sectionHeading
+
+        delegate: Rectangle {
+            width: parent.width
+            height:  50
+            radius:  5
+            border.width: 1
+            border.color:  "#888888"
+            color: delegateMouseArea.pressed ? "#AAAAFF" : "#FFFFFF"
+            Text {
+                id: delegateText;
+                text: "  " + name
+                width: parent.width
+                height: parent.height
+                font.pixelSize: 16
+                verticalAlignment: Text.AlignVCenter
+            }
+            Text {
+                id: delegateText2;
+                text: ">  "
+                width: parent.width
+                height: parent.height
+                font.pixelSize: 20
+                smooth: true
+                color: "gray"
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignRight
+            }
+
+            MouseArea {
+                id: delegateMouseArea
+                anchors.fill: parent;
+                onClicked: {
+                    testCaseList.state = "testRunning"
+                    testLoader.source = name
+                    console.log(name)
+                }
+            }
+        }
+
+        states: [
+            State {
+                name: "testRunning"
+                PropertyChanges { target: testCaseList; visible: false; hideTranslation: -main.width  }
+            },
+            State {
+                name: "testStopped"
+                PropertyChanges { target: testCaseList; visible: true; hideTranslation: 0 }
+            }
+        ]
+
+        transitions: [
+            Transition {
+            to: "testRunning"
+                SequentialAnimation {
+                    NumberAnimation { properties: "hideTranslation"; easing.type: Easing.InQuad; duration:  300 }
+                    PropertyAction { target: testCaseList; property: "visible"; value: false }
+                }
+             },
+            Transition {
+                to: "testStopped"
+                SequentialAnimation {
+                    PropertyAction { target: testCaseList; property: "visible"; value: true }
+                    NumberAnimation { properties: "hideTranslation"; easing.type: Easing.InQuad; duration:  300 }
+                }
+            }
+
+        ]
+    }
+
+    Rectangle {
+        visible: true
+        anchors.bottom: main.bottom
+        anchors.left: main.left
+        anchors.right: main.right
+        height: 40
+        color: "#cc000000"
+        Item {
+            anchors.top: parent.top
+            anchors.topMargin: 5
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            Image {
+                source: "back.svg"
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent;
+            onClicked: {
+                if (testCaseList.visible){
+                    Qt.quit()
+                } else if (!testCaseList.state != "testStopped") {
+                    testCaseList.state = "testStopped"
+                    testLoader.source = ""
+                }
+            }
+        }
+    }
+}
+
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg
new file mode 100755
index 0000000..5bc7b58
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/wallpaper.jpg
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp
new file mode 100644
index 0000000..b5b43bf
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// checksum 0xdf1f version 0x10008
+#include "qmlapplicationviewer.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+
+#if defined(QMLJSDEBUGGER)
+#include <jsdebuggeragent.h>
+#endif
+#if defined(QMLOBSERVER)
+#include <qdeclarativeviewobserver.h>
+#endif
+
+#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
+#include <eikenv.h>
+#include <eikappui.h>
+#include <aknenv.h>
+#include <aknappui.h>
+#endif // Q_OS_SYMBIAN && ORIENTATIONLOCK
+
+class QmlApplicationViewerPrivate
+{
+    QString mainQmlFile;
+    friend class QmlApplicationViewer;
+    static QString adjustPath(const QString &path);
+};
+
+QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    const QString pathInShareDir = QCoreApplication::applicationDirPath()
+        + QLatin1String("/../share/")
+        + QFileInfo(QCoreApplication::applicationFilePath()).fileName()
+        + QLatin1Char('/') + path;
+    if (QFileInfo(pathInShareDir).exists())
+        return pathInShareDir;
+#endif
+#endif
+    return path;
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
+    QDeclarativeView(parent),
+    m_d(new QmlApplicationViewerPrivate)
+{
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+#ifdef QMLJSDEBUGGER
+    new QmlJSDebugger::JSDebuggerAgent(engine());
+#endif
+#ifdef QMLOBSERVER
+    new QmlJSDebugger::QDeclarativeViewObserver(this, parent);
+#endif
+}
+
+QmlApplicationViewer::~QmlApplicationViewer()
+{
+    delete m_d;
+}
+
+void QmlApplicationViewer::setMainQmlFile(const QString &file)
+{
+    m_d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
+    setSource(QUrl::fromLocalFile(m_d->mainQmlFile));
+}
+
+void QmlApplicationViewer::addImportPath(const QString &path)
+{
+    engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
+}
+
+void QmlApplicationViewer::setOrientation(Orientation orientation)
+{
+#ifdef Q_OS_SYMBIAN
+    if (orientation != Auto) {
+#if defined(ORIENTATIONLOCK)
+        const CAknAppUiBase::TAppUiOrientation uiOrientation =
+                (orientation == LockPortrait) ? CAknAppUi::EAppUiOrientationPortrait
+                    : CAknAppUi::EAppUiOrientationLandscape;
+        CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi());
+        TRAPD(error,
+            if (appUi)
+                appUi->SetOrientationL(uiOrientation);
+        );
+#else // ORIENTATIONLOCK
+        qWarning("'ORIENTATIONLOCK' needs to be defined on Symbian when locking the orientation.");
+#endif // ORIENTATIONLOCK
+    }
+#elif defined(Q_WS_MAEMO_5)
+    Qt::WidgetAttribute attribute;
+    switch (orientation) {
+    case LockPortrait:
+        attribute = Qt::WA_Maemo5PortraitOrientation;
+        break;
+    case LockLandscape:
+        attribute = Qt::WA_Maemo5LandscapeOrientation;
+        break;
+    case Auto:
+    default:
+        attribute = Qt::WA_Maemo5AutoOrientation;
+        break;
+    }
+    setAttribute(attribute, true);
+#else // Q_OS_SYMBIAN
+    Q_UNUSED(orientation);
+#endif // Q_OS_SYMBIAN
+}
+
+void QmlApplicationViewer::show()
+{
+#ifdef Q_OS_SYMBIAN
+    showFullScreen();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+    showMaximized();
+#else
+    QDeclarativeView::show();
+#endif
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h
new file mode 100644
index 0000000..4d1a38c
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// checksum 0x39ee version 0x10008
+#ifndef QMLAPPLICATIONVIEWER_H
+#define QMLAPPLICATIONVIEWER_H
+
+#include <QtDeclarative/QDeclarativeView>
+
+class QmlApplicationViewer : public QDeclarativeView
+{
+public:
+    enum Orientation {
+        LockPortrait,
+        LockLandscape,
+        Auto
+    };
+
+    QmlApplicationViewer(QWidget *parent = 0);
+    virtual ~QmlApplicationViewer();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+    void setOrientation(Orientation orientation);
+    void show();
+
+private:
+    class QmlApplicationViewerPrivate *m_d;
+};
+
+#endif // QMLAPPLICATIONVIEWER_H
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000..79e6a9f
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,152 @@
+# checksum 0xc123 version 0x10008
+# This file should not be edited.
+# Future versions of Qt Creator might offer updated versions of this file.
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+contains(DEFINES, QMLOBSERVER) {
+    DEFINES *= QMLJSDEBUGGER
+}
+
+defineTest(minQtVersion) {
+    maj = $$1
+    min = $$2
+    patch = $$3
+    isEqual(QT_MAJOR_VERSION, $$maj) {
+        isEqual(QT_MINOR_VERSION, $$min) {
+            isEqual(QT_PATCH_VERSION, $$patch) {
+                return(true)
+            }
+            greaterThan(QT_PATCH_VERSION, $$patch) {
+                return(true)
+            }
+        }
+        greaterThan(QT_MINOR_VERSION, $$min) {
+            return(true)
+        }
+    }
+    return(false)
+}
+
+contains(DEFINES, QMLJSDEBUGGER) {
+    CONFIG(debug, debug|release) {
+        !minQtVersion(4, 7, 1) {
+            warning()
+            warning("Debugging QML requires the qmljsdebugger library that ships with Qt Creator.")
+            warning("This library requires Qt 4.7.1 or newer.")
+            warning()
+
+            error("Qt version $$QT_VERSION too old for QmlJS Debugging. Aborting.")
+        }
+        isEmpty(QMLJSDEBUGGER_PATH) {
+            warning()
+            warning("Debugging QML requires the qmljsdebugger library that ships with Qt Creator.")
+            warning("Please specify its location on the qmake command line, eg")
+            warning("  qmake -r QMLJSDEBUGGER_PATH=$CREATORDIR/share/qtcreator/qmljsdebugger")
+            warning()
+
+            error("QMLJSDEBUGGER defined, but no QMLJSDEBUGGER_PATH set on command line. Aborting.")
+            DEFINES -= QMLJSDEBUGGER
+        } else {
+            include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+        }
+    } else {
+        DEFINES -= QMLJSDEBUGGER
+    }
+}
+# This file should not be edited.
+# Future versions of Qt Creator might offer updated versions of this file.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    ICON = $${TARGET}.svg
+    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone
+    contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
+} else:win32 {
+    !isEqual(PWD,$$OUT_PWD) {
+        copyCommand = @echo Copying application data...
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$eval($${deploymentfolder}.source)
+            pathSegments = $$split(source, /)
+            sourceAndTarget = $$MAINPROFILEPWD/$$source $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
+            copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\)
+        }
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        installPrefix = /opt/usr
+        desktopfile.path = /usr/share/applications/hildon
+    } else {
+        installPrefix = /usr/local
+        desktopfile.path = /usr/share/applications
+        !isEqual(PWD,$$OUT_PWD) {
+            copyCommand = @echo Copying application data...
+            for(deploymentfolder, DEPLOYMENTFOLDERS) {
+                macx {
+                    target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+                } else {
+                    target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                }
+                copyCommand += && $(MKDIR) $$target
+                copyCommand += && $(COPY_DIR) $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) $$target
+            }
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/share/$${TARGET}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+    icon.files = $${TARGET}.png
+    icon.path = /usr/share/icons/hicolor/64x64/apps
+    desktopfile.files = $${TARGET}.desktop
+    target.path = $${installPrefix}/bin
+    export(icon.files)
+    export(icon.path)
+    export(desktopfile.files)
+    export(desktopfile.path)
+    export(target.path)
+    INSTALLS += desktopfile icon target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro
new file mode 100644
index 0000000..98101fb
--- /dev/null
+++ b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro
@@ -0,0 +1,29 @@
+QT += declarative opengl
+
+# Add more folders to ship with the application, here
+folder_01.source = qml/qmlshadersplugintest
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
+
+# Additional import path used to resolve Qml modules in Creator's code model
+QML_IMPORT_PATH =
+
+# Avoid auto screen rotation
+#DEFINES += ORIENTATIONLOCK
+
+# Needs to be defined for Symbian
+#DEFINES += NETWORKACCESS
+
+symbian:TARGET.UID3 = 0xE40472A7
+
+# Define QMLJSDEBUGGER to enable basic debugging (setting breakpoints etc)
+# Define QMLOBSERVER for advanced features (requires experimental QmlInspector plugin!)
+#DEFINES += QMLJSDEBUGGER
+#DEFINES += QMLOBSERVER
+
+# The .cpp file which was generated for your project. Feel free to hack it.
+SOURCES += main.cpp
+
+# Please do not modify the following two lines. Required for deployment.
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()