Merge "Merge branch 'stable' into dev" into refs/staging/dev

943 files changed, 3810 insertions, 3060 deletions

diff --git a/.gitignore b/.gitignore
index 914f9e39e0..2f83627143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,6 @@ tests/auto/*/*.o
 tests/auto/*/*.moc
 tests/auto/*/*/*.o
 tests/auto/*/*/*.moc
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45fb..5de255cb69 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 0000000000..9959c36a11
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,56 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+Qt QML
+------
+
+Qt Quick
+--------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro
deleted file mode 100644
index 6a147f4ce6..0000000000
--- a/examples/demos/calqlatr/calqlatr.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
-qml.files = calqlatr.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
-sources.files = $$SOURCES calqlatr.pro
-sources.path = $$qml.path
-INSTALLS += target sources qml
diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
deleted file mode 100644
index b243396986..0000000000
--- a/examples/demos/demos.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS =   calqlatr \
-            samegame \
-            tweetsearch \
-            maroon \
-            stocqt
-
-# install
-sources.files = demos.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos
-INSTALLS += sources
diff --git a/examples/demos/maroon/maroon.pro b/examples/demos/maroon/maroon.pro
deleted file mode 100644
index fa2e4b5709..0000000000
--- a/examples/demos/maroon/maroon.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
-qml.files = maroon.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
-sources.files = $$SOURCES maroon.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro
deleted file mode 100644
index 2f7afef5a5..0000000000
--- a/examples/demos/samegame/samegame.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
-qml.files = samegame.qml content settings.js
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
-sources.files = $$SOURCES samegame.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/stocqt/content/Button.qml b/examples/demos/stocqt/content/Button.qml
deleted file mode 100644
index 0e99c52c51..0000000000
--- a/examples/demos/stocqt/content/Button.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-  id:button
-  property bool buttonEnabled:true
-  radius:5
-  width:25
-  height:25
-  color:buttonEnabled ? "steelblue" : "gray"
-  MouseArea {
-    anchors.fill:parent
-    onClicked: {
-      if (buttonEnabled)
-       buttonEnabled = false;
-      else
-       buttonEnabled = true;
-    }
-  }
-}
diff --git a/examples/demos/stocqt/content/DatePicker.qml b/examples/demos/stocqt/content/DatePicker.qml
deleted file mode 100644
index 82d8788bd9..0000000000
--- a/examples/demos/stocqt/content/DatePicker.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-  id:root
-  color:"transparent"
-  width:300
-  height:45
-  property var _monthNames : [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN","JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ];
-  property var date:new Date()
-
-  onDateChanged: {
-    month.text = root._monthNames[root.date.getMonth()]
-    day.text = date.getDate();
-    year.text = date.getFullYear();
-  }
-  Row {
-    spacing:20
-    anchors.fill:parent
-
-    Rectangle {
-      height:root.height
-      width:root.width/3 - 20
-      color:"#272822"
-      radius:5
-
-      TextInput {
-        id:month
-        anchors.centerIn:parent
-        color:"#ecc089"
-        font.pointSize:25
-        font.bold:true
-        text:root._monthNames[root.date.getMonth()]
-        onAccepted : {
-          for (var i = 0; i < 12; i++) {
-             if (text === root._monthNames[i]) {
-                root.date.setMonth(i);
-                root.date = root.date;
-                return;
-             }
-          }
-          root.date = root.date;
-        }
-      }
-    }
-
-    Rectangle {
-      height:root.height
-      width:root.width/3 - 20
-      color:"#272822"
-      radius:5
-
-      TextInput {
-        id:day
-        anchors.centerIn:parent
-        color:"#ecc089"
-        font.pointSize:25
-        font.bold:true
-        text:root.date.getDate()
-        validator:IntValidator {bottom:1; top:31}
-        onAccepted: { root.date.setDate(text); root.date = root.date;}
-      }
-    }
-
-    Rectangle {
-      height:root.height
-      width:root.width/3 - 20
-      color:"#272822"
-      radius:5
-
-      TextInput {
-        id:year
-        anchors.centerIn:parent
-        color:"#ecc089"
-        font.pointSize:25
-        font.bold:true
-        text:root.date.getFullYear()
-        validator:IntValidator {bottom:1995; top:(new Date()).getFullYear()}
-        onAccepted:{ root.date.setFullYear(text); root.date = root.date;}
-      }
-    }
-  }
-}
diff --git a/examples/demos/stocqt/content/StockChart.qml b/examples/demos/stocqt/content/StockChart.qml
deleted file mode 100644
index c7411679bb..0000000000
--- a/examples/demos/stocqt/content/StockChart.qml
+++ /dev/null
@@ -1,324 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-Rectangle {
-    id:chart
-    width:320
-    height:320
-    color:"transparent"
-    property var _months : [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]
-    property var stockModel:null
-    property var startDate
-    property var endDate
-    property var settings
-
-    function update() {
-        if (settings.chartType === "year")
-            chart.startDate = new Date(chart.endDate.getFullYear() - 1, chart.endDate.getMonth(), chart.endDate.getDate());
-        else if (settings.chartType === "month")
-             chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth() -1, chart.endDate.getDate())
-        else if (settings.chartType === "week")
-             chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth(), chart.endDate.getDate() - 7)
-        else
-             chart.startDate = new Date(1995, 3, 25)
-
-        canvas.requestPaint();
-    }
-
-
-    Text {
-        id:fromDate
-        color:"#6a5b44"
-        width:50
-        font.pointSize: 10
-        wrapMode: Text.WordWrap
-        anchors.left: parent.left
-        anchors.leftMargin: 20
-        anchors.top:parent.top
-        text:_months[startDate.getMonth()] + "\n" + startDate.getFullYear()
-    }
-
-    Text {
-        id:toDate
-        color:"#6a5b44"
-        font.pointSize: 10
-        width:50
-        wrapMode: Text.WordWrap
-        anchors.right: parent.right
-        anchors.leftMargin: 20
-        anchors.top:parent.top
-        text:_months[endDate.getMonth()] + "\n" + endDate.getFullYear()
-    }
-
-    Canvas {
-    id:canvas
-    anchors.top : toDate.bottom
-    width:parent.width
-    anchors.bottom: parent.bottom
-
-    renderTarget: Canvas.FramebufferObject
-    property int frames:first
-    property int mouseX:0;
-    property int mouseY:0;
-    property int mousePressedX:0;
-    property int mousePressedY:0;
-    property int movedY:0
-    property real scaleX:1.0;
-    property real scaleY:1.0;
-    property int first:0;
-    property int last:0;
-
-//    MouseArea {
-//        anchors.fill: parent
-
-//        onPositionChanged: {
-//            if (mouse.modifiers & Qt.ControlModifier) {
-//                if (canvas.mouseX == 0 && canvas.mouseY == 0) {
-//                    canvas.mouseX = mouse.x;
-//                    canvas.mouseY = mouse.y;
-//                }
-//            } else{
-//                var w = (view.width/view.count)*canvas.scaleX;
-
-//                //canvas.movedY += Math.round((canvas.mousePressedY - mouse.y)/2);
-
-//                var movedX = Math.round((canvas.mousePressedX - mouse.x)/w);
-//                if (movedX != 0 || canvas.movedY != 0) {
-//                    if (canvas.first + movedX >= 0 && canvas.last + movedX < view.count) {
-//                        canvas.first += movedX;
-//                        canvas.last += movedX;
-//                    }
-//                    canvas.requestPaint();
-//                }
-//            }
-//        }
-
-//        onPressed:  {
-//            canvas.mousePressedX = mouse.x;
-//            canvas.mousePressedY = mouse.y;
-//        }
-
-//        onReleased : {
-//            if (mouse.modifiers & Qt.ControlModifier) {
-//                var sx = mouse.x - canvas.mouseX;
-//                var sy = canvas.mouseY - mouse.y;
-
-//                if (Math.abs(sx) < 50) sx = 0;
-//                if (Math.abs(sy) < 50) sy = 0;
-
-//                if (sx > 0)
-//                    canvas.scaleX *= sx/100 +1;
-//                else
-//                    canvas.scaleX *= 1/(-sx/100 + 1);
-
-//                if (sy > 0)
-//                    canvas.scaleY *= sy/100 +1;
-//                else
-//                    canvas.scaleY *= 1/(-sy/100 + 1);
-
-//                if (canvas.scaleX < 1)
-//                    canvas.scaleX = 1;
-
-//                //console.log("scaleX:" + canvas.scaleX + ", scaleY:" + canvas.scaleY);
-
-//                canvas.first = Math.round(view.currentIndex - view.currentIndex / canvas.scaleX);
-//                canvas.last = Math.round(view.currentIndex + (view.count - view.currentIndex) / canvas.scaleX);
-
-//                canvas.mouseX = 0;
-//                canvas.mouseY = 0;
-//                canvas.mousePressedX = 0;
-//                canvas.mousePressedY = 0;
-//                canvas.requestPaint();
-//            }
-//        }
-//    }
-
-    function drawBackground(ctx) {
-        ctx.save();
-        ctx.fillStyle = "#272822"
-        ctx.fillRect(0, 0, canvas.width, canvas.height)
-        ctx.strokeStyle = "#423a2f"
-        ctx.beginPath();
-        for (var i = 0; i < 10; i++) {
-            ctx.moveTo(0, i * (canvas.height/10.0));
-            ctx.lineTo(canvas.width, i * (canvas.height/10.0));
-        }
-
-        for (i = 0; i < 12; i++) {
-            ctx.moveTo(i * (canvas.width/12.0), 0);
-            ctx.lineTo(i * (canvas.width/12.0), canvas.height);
-        }
-        ctx.stroke();
-
-        ctx.strokeStyle = "#5c7a37"
-        ctx.beginPath();
-        ctx.moveTo(8 * (canvas.width/12.0), 0);
-        ctx.lineTo(8 * (canvas.width/12.0), canvas.height);
-        ctx.stroke();
-
-        ctx.restore();
-    }
-
-    function drawPrice(ctx, from, to, color, price, points, highest)
-    {
-        ctx.save();
-        ctx.globalAlpha = 0.7;
-        ctx.strokeStyle = color;
-        ctx.lineWidth = 1;
-        ctx.beginPath();
-
-        var w = canvas.width/points.length;
-        var end = points.length;
-        for (var i = 0; i < end; i++) {
-            var x = points[i].x;
-            var y = points[i][price];
-            y = canvas.height * y/highest;
-            if (i == 0) {
-                ctx.moveTo(x+w/2, y);
-            } else {
-                ctx.lineTo(x+w/2, y);
-            }
-        }
-        ctx.stroke();
-        ctx.restore();
-    }
-
-    function drawKLine(ctx, from, to, points, highest)
-    {
-        ctx.save();
-        ctx.globalAlpha = 0.4;
-        ctx.lineWidth = 2;
-        var end = points.length;
-        for (var i = 0; i < end; i++) {
-            var x = points[i].x;
-            var open = canvas.height * points[i].open/highest - canvas.movedY;
-            var close = canvas.height * points[i].close/highest - canvas.movedY;
-            var high = canvas.height * points[i].high/highest - canvas.movedY;
-            var low = canvas.height * points[i].low/highest - canvas.movedY;
-
-            var top, bottom;
-            if (close <= open) {
-                ctx.fillStyle = Qt.rgba(1, 0, 0, 1);
-                ctx.strokeStyle = Qt.rgba(1, 0, 0, 1);
-                top = close;
-                bottom = open;
-            } else {
-                ctx.fillStyle = Qt.rgba(0, 1, 0, 1);
-                ctx.strokeStyle = Qt.rgba(0, 1, 0, 1);
-                top = open;
-                bottom = close;
-            }
-
-            var w1, w2;
-            w1 = canvas.width/points.length;
-            w2 = w1 > 10 ? w1/2 : w1;
-
-            ctx.fillRect(x + (w1 - w2)/2, top, w2, bottom - top);
-            ctx.beginPath();
-            ctx.moveTo(x+w1/2, high);
-            ctx.lineTo(x+w1/2, low);
-            ctx.stroke();
-        }
-        ctx.restore();
-    }
-
-    function drawVolume(ctx, from, to, color, price, points, highest)
-    {
-        ctx.save();
-        ctx.fillStyle = color;
-        ctx.globalAlpha = 0.6;
-        ctx.strokeStyle = Qt.rgba(0.8, 0.8, 0.8, 1);
-        ctx.lineWidth = 1;
-
-        var end = points.length;
-        for (var i = 0; i < end; i++) {
-            var x = points[i].x;
-            var y = points[i][price];
-            y = canvas.height * (1 - y/highest);
-            ctx.fillRect(x, y, canvas.width/points.length, canvas.height - y);
-        }
-        ctx.restore();
-    }
-
-    onPaint: {
-        var ctx = canvas.getContext("2d");
-
-        ctx.globalCompositeOperation = "source-over";
-        ctx.lineWidth = 1;
-
-        drawBackground(ctx);
-        if (!stockModel.ready)
-            return;
-
-        last = stockModel.indexOf(chart.endDate)
-        first = last - (chart.endDate.getTime() - chart.startDate.getTime())/86400000;
-        console.log("painting...  first:" + first + ", last:" + last);
-
-        var highestPrice = stockModel.highestPrice;
-        var highestVolume = stockModel.highestVolume;
-        console.log("highest price:" + highestPrice + ", highest volume:" + highestVolume)
-        var points = [];
-        for (var i = 0; i <= last - first; i++) {
-            var price = stockModel.get(i + first);
-            points.push({
-                         x: i*canvas.width/(last-first+1),
-                         open: price.open,
-                         close: price.close,
-                         high:price.high,
-                         low:price.low,
-                         volume:price.volume
-                        });
-        }
-        if (settings.drawHighPrice)
-            drawPrice(ctx, first, last, settings.highColor,"high", points, highestPrice);
-        if (settings.drawLowPrice)
-            drawPrice(ctx, first, last, settings.lowColor,"low", points, highestPrice);
-        if (settings.drawOpenPrice)
-            drawPrice(ctx, first, last,settings.openColor,"open", points, highestPrice);
-        if (settings.drawClosePrice)
-            drawPrice(ctx, first, last, settings.closeColor,"close", points, highestPrice);
-        if (settings.drawVolume)
-            drawVolume(ctx, first, last, settings.volumeColor,"volume", points, highestVolume);
-        if (settings.drawKLine)
-            drawKLine(ctx, first, last, points, highestPrice);
-    }
-}
-}
diff --git a/examples/demos/stocqt/content/StockListModel.qml b/examples/demos/stocqt/content/StockListModel.qml
deleted file mode 100644
index b1e0706a3a..0000000000
--- a/examples/demos/stocqt/content/StockListModel.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-ListModel {
-    id:stocks
-    //Data from : http://en.wikipedia.org/wiki/NASDAQ-100
-
-    ListElement {name:"Activision Blizzard"; stockId:"ATVI"}
-    ListElement {name:"Adobe Systems Incorporated"; stockId:"ADBE"}
-    ListElement {name:"Akamai Technologies, Inc"; stockId:"AKAM"}
-    ListElement {name:"Alexion Pharmaceuticals"; stockId:"ALXN"}
-    ListElement {name:"Altera Corporation"; stockId:"ALTR"}
-    ListElement {name:"Amazon.com, Inc."; stockId:"AMZN"}
-    ListElement {name:"Amgen Inc."; stockId:"AMGN"}
-    ListElement {name:"Apollo Group, Inc."; stockId:"APOL"}
-    ListElement {name:"Apple Inc."; stockId:"AAPL"}
-    ListElement {name:"Applied Materials, Inc."; stockId:"AMAT"}
-    ListElement {name:"Autodesk, Inc."; stockId:"ADSK"}
-    ListElement {name:"Automatic Data Processing, Inc."; stockId:"ADP"}
-    ListElement {name:"Baidu.com, Inc."; stockId:"BIDU"}
-    ListElement {name:"Bed Bath & Beyond Inc."; stockId:"BBBY"}
-    ListElement {name:"Biogen Idec, Inc"; stockId:"BIIB"}
-    ListElement {name:"BMC Software, Inc."; stockId:"BMC"}
-    ListElement {name:"Broadcom Corporation"; stockId:"BRCM"}
-    ListElement {name:"C. H. Robinson Worldwide, Inc."; stockId:"CHRW"}
-    ListElement {name:"CA, Inc."; stockId:"CA"}
-    ListElement {name:"Celgene Corporation"; stockId:"CELG"}
-    ListElement {name:"Cephalon, Inc."; stockId:"CEPH"}
-    ListElement {name:"Cerner Corporation"; stockId:"CERN"}
-    ListElement {name:"Check Point Software Technologies Ltd."; stockId:"CHKP"}
-    ListElement {name:"Cisco Systems, Inc."; stockId:"CSCO"}
-    ListElement {name:"Citrix Systems, Inc."; stockId:"CTXS"}
-    ListElement {name:"Cognizant Technology Solutions Corporation"; stockId:"CTSH"}
-    ListElement {name:"Comcast Corporation"; stockId:"CMCSA"}
-    ListElement {name:"Costco Wholesale Corporation"; stockId:"COST"}
-    ListElement {name:"Ctrip.com International, Ltd."; stockId:"CTRP"}
-    ListElement {name:"Dell Inc."; stockId:"DELL"}
-    ListElement {name:"DENTSPLY International Inc."; stockId:"XRAY"}
-    ListElement {name:"DirecTV"; stockId:"DTV"}
-    ListElement {name:"Dollar Tree, Inc."; stockId:"DLTR"}
-    ListElement {name:"eBay Inc."; stockId:"EBAY"}
-    ListElement {name:"Electronic Arts Inc."; stockId:"ERTS"}
-    ListElement {name:"Expedia, Inc."; stockId:"EXPE"}
-    ListElement {name:"Expeditors International of Washington, Inc."; stockId:"EXPD"}
-    ListElement {name:"Express Scripts, Inc."; stockId:"ESRX"}
-    ListElement {name:"F5 Networks, Inc."; stockId:"FFIV"}
-    ListElement {name:"Fastenal Company"; stockId:"FAST"}
-    ListElement {name:"First Solar, Inc."; stockId:"FSLR"}
-    ListElement {name:"Fiserv, Inc."; stockId:"FISV"}
-    ListElement {name:"Flextronics International Ltd."; stockId:"FLEX"}
-    ListElement {name:"FLIR Systems, Inc."; stockId:"FLIR"}
-    ListElement {name:"Garmin Ltd."; stockId:"GRMN"}
-    ListElement {name:"Gilead Sciences, Inc."; stockId:"GILD"}
-    ListElement {name:"Google Inc."; stockId:"GOOG"}
-    ListElement {name:"Green Mountain Coffee Roasters, Inc."; stockId:"GMCR"}
-    ListElement {name:"Henry Schein, Inc."; stockId:"HSIC"}
-    ListElement {name:"Illumina, Inc."; stockId:"ILMN"}
-    ListElement {name:"Infosys Technologies"; stockId:"INFY"}
-    ListElement {name:"Intel Corporation"; stockId:"INTC"}
-    ListElement {name:"Intuit, Inc."; stockId:"INTU"}
-    ListElement {name:"Intuitive Surgical Inc."; stockId:"ISRG"}
-    ListElement {name:"Joy Global Inc."; stockId:"JOYG"}
-    ListElement {name:"KLA Tencor Corporation"; stockId:"KLAC"}
-    ListElement {name:"Lam Research Corporation"; stockId:"LRCX"}
-    ListElement {name:"Liberty Media Corporation, Interactive Series A"; stockId:"LINTA"}
-    ListElement {name:"Life Technologies Corporation"; stockId:"LIFE"}
-    ListElement {name:"Linear Technology Corporation"; stockId:"LLTC"}
-    ListElement {name:"Marvell Technology Group, Ltd."; stockId:"MRVL"}
-    ListElement {name:"Mattel, Inc."; stockId:"MAT"}
-    ListElement {name:"Maxim Integrated Products"; stockId:"MXIM"}
-    ListElement {name:"Microchip Technology Incorporated"; stockId:"MCHP"}
-    ListElement {name:"Micron Technology, Inc."; stockId:"MU"}
-    ListElement {name:"Microsoft Corporation"; stockId:"MSFT"}
-    ListElement {name:"Mylan, Inc."; stockId:"MYL"}
-    ListElement {name:"NetApp, Inc."; stockId:"NTAP"}
-    ListElement {name:"Netflix, Inc."; stockId:"NFLX"}
-    ListElement {name:"News Corporation, Ltd."; stockId:"NWSA"}
-    ListElement {name:"NII Holdings, Inc."; stockId:"NIHD"}
-    ListElement {name:"NVIDIA Corporation"; stockId:"NVDA"}
-    ListElement {name:"O'Reilly Automotive, Inc."; stockId:"ORLY"}
-    ListElement {name:"Oracle Corporation"; stockId:"ORCL"}
-    ListElement {name:"PACCAR Inc."; stockId:"PCAR"}
-    ListElement {name:"Paychex, Inc."; stockId:"PAYX"}
-    ListElement {name:"Priceline.com, Incorporated"; stockId:"PCLN"}
-    ListElement {name:"Qiagen N.V."; stockId:"QGEN"}
-    ListElement {name:"QUALCOMM Incorporated"; stockId:"QCOM"}
-    ListElement {name:"Research in Motion Limited"; stockId:"RIMM"}
-    ListElement {name:"Ross Stores Inc."; stockId:"ROST"}
-    ListElement {name:"SanDisk Corporation"; stockId:"SNDK"}
-    ListElement {name:"Seagate Technology Holdings"; stockId:"STX"}
-    ListElement {name:"Sears Holdings Corporation"; stockId:"SHLD"}
-    ListElement {name:"Sigma-Aldrich Corporation"; stockId:"SIAL"}
-    ListElement {name:"Staples Inc."; stockId:"SPLS"}
-    ListElement {name:"Starbucks Corporation"; stockId:"SBUX"}
-    ListElement {name:"Stericycle, Inc"; stockId:"SRCL"}
-    ListElement {name:"Symantec Corporation"; stockId:"SYMC"}
-    ListElement {name:"Teva Pharmaceutical Industries Ltd."; stockId:"TEVA"}
-    ListElement {name:"Urban Outfitters, Inc."; stockId:"URBN"}
-    ListElement {name:"VeriSign, Inc."; stockId:"VRSN"}
-    ListElement {name:"Vertex Pharmaceuticals"; stockId:"VRTX"}
-    ListElement {name:"Virgin Media, Inc."; stockId:"VMED"}
-    ListElement {name:"Vodafone Group, plc."; stockId:"VOD"}
-    ListElement {name:"Warner Chilcott, Ltd."; stockId:"WCRX"}
-    ListElement {name:"Whole Foods Market, Inc."; stockId:"WFM"}
-    ListElement {name:"Wynn Resorts Ltd."; stockId:"WYNN"}
-    ListElement {name:"Xilinx, Inc."; stockId:"XLNX"}
-    ListElement {name:"Yahoo! Inc."; stockId:"YHOO"}
-}
diff --git a/examples/demos/stocqt/content/StockListView.qml b/examples/demos/stocqt/content/StockListView.qml
deleted file mode 100644
index c241efb54c..0000000000
--- a/examples/demos/stocqt/content/StockListView.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-  id:root
-  width:320
-  height:480
-  color:"#423A2F"
-
-  property string currentStockId:""
-  property string currentStockName:""
-
-  ListView {
-    id:view
-    anchors.fill:parent
-    keyNavigationWraps:true
-    focus:true
-    snapMode: ListView.SnapToItem
-    model:StockListModel{}
-
-    onCurrentIndexChanged: {
-        root.currentStockId = model.get(currentIndex).stockId
-        root.currentStockName = model.get(currentIndex).name
-        console.log("current stock:" + root.currentStockId + " - " + root.currentStockName)
-    }
-
-    delegate:Rectangle {
-       height:30
-       width:parent.width
-       color:"transparent"
-       MouseArea {
-         anchors.fill: parent
-         onClicked:view.currentIndex = index
-       }
-
-       Text {
-         anchors.verticalCenter : parent.top
-         anchors.verticalCenterOffset : 15
-         color:index == view.currentIndex ? "#ECC089" : "#A58963"
-         font.pointSize:12
-         font.bold:true
-         text:"         " + stockId + " - " + name
-        }
-    }
-
-    highlight:Image {height:30; width:parent.width; source:"images/stock-selected.png"}
-  }
-}
\ No newline at end of file
diff --git a/examples/demos/stocqt/content/StockSettings.qml b/examples/demos/stocqt/content/StockSettings.qml
deleted file mode 100644
index 600747b969..0000000000
--- a/examples/demos/stocqt/content/StockSettings.qml
+++ /dev/null
@@ -1,317 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-  id:root
-  width:320
-  height:480
-  color:"#423A2F"
-  property var startDate : startDatePicker.date;
-  property var endDate : endDatePicker.date;
-
-  property bool drawHighPrice:highButton.buttonEnabled
-  property bool drawLowPrice:lowButton.buttonEnabled
-  property bool drawOpenPrice:openButton.buttonEnabled
-  property bool drawClosePrice:closeButton.buttonEnabled
-  property bool drawVolume:volumeButton.buttonEnabled
-  property bool drawKLine:klineButton.buttonEnabled
-
-  property color highColor:Qt.rgba(1, 0, 0, 1)
-  property color lowColor:Qt.rgba(0, 1, 0, 1)
-  property color openColor:Qt.rgba(0, 0, 1, 1)
-  property color closeColor:"#ecc088"
-  property color volumeColor:Qt.rgba(0.3, 0.5, 0.7, 1)
-
-  property string chartType:"year"
-  Image {
-    id:logo
-    source:"images/logo.png"
-    anchors.horizontalCenter : parent.horizontalCenter
-    anchors.top:parent.top
-    anchors.topMargin:15
-  }
-
-  Text {
-    id:startDateText
-    text:"START DATE:"
-    color:"#76644A"
-    font.pointSize:15
-    anchors.left:parent.left
-    anchors.leftMargin:20
-    anchors.top:logo.bottom
-    anchors.topMargin:20
-  }
-
-  DatePicker {
-    id:startDatePicker
-    anchors.left:parent.left
-    anchors.leftMargin:30
-    anchors.top:startDateText.bottom
-    anchors.topMargin:15
-    date : new Date(1995, 3, 25)
-  }
-
-  Text {
-    id:endDateText
-    text:"END DATE:"
-    color:"#76644A"
-    font.pointSize:15
-    anchors.left:parent.left
-    anchors.leftMargin:20
-    anchors.top:startDatePicker.bottom
-    anchors.topMargin:20
-  }
-
-  DatePicker {
-    id:endDatePicker
-    anchors.left:parent.left
-    anchors.leftMargin:30
-    anchors.top:endDateText.bottom
-    anchors.topMargin:15
-  }
-
-  Text {
-    id:drawOptionsText
-    text:"DRAW OPTIONS:"
-    color:"#76644A"
-    font.pointSize:15
-    anchors.left:parent.left
-    anchors.leftMargin:20
-    anchors.top:endDatePicker.bottom
-    anchors.topMargin:20
-  }
-  Column {
-      id:drawOptions
-      anchors.top:drawOptionsText.bottom
-      anchors.topMargin: 20
-      anchors.left: parent.left
-      anchors.leftMargin: 30
-      spacing:2
-       Row{
-           spacing:10
-          Text {
-            text:"High   "
-            color:"#76644A"
-            font.pointSize:15
-          }
-
-          Button {
-             id:highButton
-             buttonEnabled:false
-          }
-
-          Text {
-            text:"Low     "
-            color:"#76644A"
-            font.pointSize:15
-          }
-
-          Button {
-             id:lowButton
-             buttonEnabled:false
-          }
-
-          Text {
-            text:"Open "
-            color:"#76644A"
-            font.pointSize:15
-          }
-          Button {
-             id:openButton
-             buttonEnabled:false
-          }
-      }
-       Row{
-           spacing:10
-          Text {
-            text:"Close "
-            color:"#76644A"
-            font.pointSize:15
-          }
-          Button {
-             id:closeButton
-             buttonEnabled:true
-          }
-          Text {
-            text:"Volume"
-            color:"#76644A"
-            font.pointSize:15
-          }
-          Button {
-             id:volumeButton
-             buttonEnabled:true
-          }
-          Text {
-            text:"K Line"
-            color:"#76644A"
-            font.pointSize:15
-          }
-          Button {
-             id:klineButton
-             buttonEnabled:false
-          }
-      }
-  }
-
-
-  Text {
-    id:chartTypeText
-    text:"CHART TYPE:"
-    color:"#76644A"
-    font.pointSize:15
-    anchors.left:parent.left
-    anchors.leftMargin:20
-    anchors.top:drawOptions.bottom
-    anchors.topMargin:20
-  }
-  Row {
-      anchors.left: parent.left
-      anchors.leftMargin: 20
-      anchors.top : chartTypeText.bottom
-      anchors.topMargin: 20
-      spacing:10
-      Rectangle {
-          id:yearView
-          width:70
-          height:30
-          radius:10
-          color:"steelblue"
-          Text {
-              anchors.horizontalCenter: parent.horizontalCenter
-              anchors.fill: parent
-              font.pointSize: 15
-              text:"YEAR"
-          }
-          MouseArea {
-              anchors.fill: parent
-              onClicked: {
-                  if (root.chartType != "year") {
-                      root.chartType = "year";
-                      yearView.color = "steelblue"
-                      monthView.color = "gray"
-                      weekView.color = "gray"
-                      allView.color = "gray"
-                  }
-              }
-          }
-      }
-      Rectangle {
-          id:monthView
-          width:70
-          radius:10
-          height:30
-          color:"gray"
-          Text {
-              anchors.fill: parent
-              anchors.horizontalCenter: parent.horizontalCenter
-              font.pointSize: 15
-              color:"#ecc089"
-              text:"MONTH"
-          }
-          MouseArea {
-              anchors.fill: parent
-              onClicked: {
-                  if (root.chartType != "month") {
-                      root.chartType = "month";
-                      yearView.color = "gray"
-                      monthView.color = "steelblue"
-                      weekView.color = "gray"
-                      allView.color = "gray"
-                  }
-              }
-          }
-
-      }
-      Rectangle {
-          id:weekView
-          height:30
-          width:70
-          radius:10
-          color:"gray"
-          Text {
-              anchors.fill: parent
-              anchors.horizontalCenter: parent.horizontalCenter
-              font.pointSize: 15
-              color:"#ecc089"
-              text:"WEEK"
-          }
-          MouseArea {
-              anchors.fill: parent
-              onClicked: {
-                  if (root.chartType != "week") {
-                      root.chartType = "week";
-                      yearView.color = "gray"
-                      monthView.color = "gray"
-                      weekView.color = "steelblue"
-                      allView.color = "gray"
-                  }
-              }
-          }
-      }
-      Rectangle {
-          id:allView
-          width:70
-          radius:10
-          height:30
-          color:"gray"
-          Text {
-              anchors.horizontalCenter: parent.horizontalCenter
-              anchors.fill: parent
-              font.pointSize: 15
-              color:"#ecc089"
-              text:"ALL"
-          }
-          MouseArea {
-              anchors.fill: parent
-              onClicked: {
-                  if (root.chartType != "all") {
-                      root.chartType = "all";
-                      yearView.color = "gray"
-                      monthView.color = "gray"
-                      weekView.color = "gray"
-                      allView.color = "steelblue"
-                  }
-              }
-          }
-      }
-  }
-}
diff --git a/examples/demos/stocqt/content/StockView.qml b/examples/demos/stocqt/content/StockView.qml
deleted file mode 100644
index 49e6c98622..0000000000
--- a/examples/demos/stocqt/content/StockView.qml
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-Rectangle {
-  id:root
-  width:320
-  height:480
-  color:"#423A2F"
-  property var stock:null
-  property var stocklist:null
-  property var settings:null
-  signal listViewClicked
-  signal settingsClicked
-
-  function update() {
-     chart.endDate = settings.endDate
-     chart.update()
-  }
-
-  Rectangle {
-    color:"#272822"
-    anchors.fill:parent
-    radius:20
-
-    Image {
-      source:"images/icon-items.png"
-      anchors.left:parent.left
-      anchors.leftMargin:10
-      anchors.top:parent.top
-      anchors.topMargin:10
-      MouseArea {
-        anchors.fill:parent
-        onClicked:listViewClicked()
-      }
-    }
-    Image {
-      source:"images/icon-settings.png"
-      anchors.right:parent.right
-      anchors.rightMargin:10
-      anchors.top:parent.top
-      anchors.topMargin:10
-      MouseArea {
-        anchors.fill:parent
-        onClicked:settingsClicked()
-      }
-    }
-
-    Text {
-      id:desc
-      anchors.left:parent.left
-      anchors.leftMargin:20
-      anchors.top:parent.top
-      anchors.topMargin:40
-      color:"#564c3A"
-      font.pointSize:15
-      text:root.stock.stockId + " - " + root.stock.stockName
-    }
-
-    Text {
-      id:price
-      anchors.left:parent.left
-      anchors.leftMargin:20
-      anchors.top:desc.bottom
-      anchors.topMargin:5
-      color:"#ECC089"
-      font.pointSize:30
-      text:root.stock.stockPrice
-    }
-
-    Text {
-      id:priceChange
-      anchors.left:parent.left
-      anchors.leftMargin:20
-      anchors.top:price.bottom
-      anchors.topMargin:5
-      color: root.stock.stockPriceChanged < 0 ? "#A43D3D" : "#679B3A"
-      font.pointSize:25
-      text: root.stock.stockPriceChanged + " (" + Math.abs(Math.round(root.stock.stockPriceChanged/(root.stock.stockPrice - root.stock.stockPriceChanged) * 100))/100  +"%)"
-    }
-
-    StockChart {
-        id:chart
-        anchors.bottom: parent.bottom
-        anchors.top : priceChange.bottom
-        anchors.topMargin: 30
-        width:parent.width
-        stockModel:root.stock
-        settings:root.settings
-    }
-  }
-}
diff --git a/examples/demos/stocqt/content/images/stock-selected.png b/examples/demos/stocqt/content/images/stock-selected.png
deleted file mode 100644
index 5629796b9c..0000000000
--- a/examples/demos/stocqt/content/images/stock-selected.png
+++ /dev/null
diff --git a/examples/demos/stocqt/stocqt.pro b/examples/demos/stocqt/stocqt.pro
deleted file mode 100644
index dfa1924946..0000000000
--- a/examples/demos/stocqt/stocqt.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
-qml.files = stocqt.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
-sources.files = $$SOURCES stocqt.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/stocqt/stocqt.qml b/examples/demos/stocqt/stocqt.qml
deleted file mode 100644
index 3f8a84a810..0000000000
--- a/examples/demos/stocqt/stocqt.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "./content"
-
-ListView {
-  id:root
-  width:320
-  height:480
-  snapMode:ListView.SnapOneItem
-  focus:false
-  orientation : ListView.Horizontal
-  boundsBehavior : Flickable.StopAtBounds
-  currentIndex : 1
-
-  StockModel {
-    id:stock
-    stockId:listView.currentStockId
-    stockName: listView.currentStockName
-    startDate: settings.startDate
-    endDate:settings.endDate
-    onStockIdChanged: updateStock()
-    onStartDateChanged: updateStock()
-    onEndDateChanged: updateStock()
-    onDataReady: {
-        root.currentIndex = 1
-        stockView.update()
-    }
-  }
-
-  model: VisualItemModel {
-    StockListView {
-      id:listView
-      width:root.width
-      height:root.height
-    }
-
-    StockView {
-      id:stockView
-      width:root.width
-      height:root.height
-      stocklist : listView
-      settings : settings
-      stock: stock
-
-      onListViewClicked:root.currentIndex = 0
-      onSettingsClicked:root.currentIndex = 2
-    }
-
-    StockSettings {
-      id:settings
-      width:root.width
-      height:root.height
-      onDrawHighPriceChanged: stockView.update()
-      onDrawLowPriceChanged: stockView.update()
-      onDrawOpenPriceChanged: stockView.update()
-      onDrawClosePriceChanged: stockView.update()
-      onDrawVolumeChanged: stockView.update()
-      onDrawKLineChanged: stockView.update()
-      onChartTypeChanged: stockView.update()
-    }
-  }
-}
diff --git a/examples/demos/tweetsearch/main.cpp b/examples/demos/tweetsearch/main.cpp
deleted file mode 100644
index 8b1d59679c..0000000000
--- a/examples/demos/tweetsearch/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(tweetsearch)
diff --git a/examples/demos/tweetsearch/tweetsearch.pro b/examples/demos/tweetsearch/tweetsearch.pro
deleted file mode 100644
index 36f4377de1..0000000000
--- a/examples/demos/tweetsearch/tweetsearch.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
-qml.files = tweetsearch.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
-sources.files = $$SOURCES tweetsearch.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/examples.pro b/examples/examples.pro
index f2b7a2dddf..1bcc66d164 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,16 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    demos \
-    shared \
-    localstorage \
-    particles \
+    qmltest \
     qml \
-    quick \
-    tutorials \
-    window \
-    qmltest
-
-# install
-sources.files = shared examples.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/
-INSTALLS += sources
+    quick
diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
deleted file mode 100644
index d9058700ff..0000000000
--- a/examples/localstorage/localstorage.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += localstorage
-
-# install
-sources.files = localstorage.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
-INSTALLS += sources
diff --git a/examples/localstorage/localstorage/localstorage.pro b/examples/localstorage/localstorage/localstorage.pro
deleted file mode 100644
index 504f9f77c1..0000000000
--- a/examples/localstorage/localstorage/localstorage.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
-qml.files = localstorage.qml hello.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
-sources.files = $$SOURCES localstorage.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/localstorage/localstorage/main.cpp b/examples/localstorage/localstorage/main.cpp
deleted file mode 100644
index 0f69fb7fdb..0000000000
--- a/examples/localstorage/localstorage/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(localstorage)
diff --git a/examples/particles/affectors/affectors.pro b/examples/particles/affectors/affectors.pro
deleted file mode 100644
index 231be91f01..0000000000
--- a/examples/particles/affectors/affectors.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
-qml.files = affectors.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
-sources.files = $$SOURCES affectors.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/affectors/main.cpp b/examples/particles/affectors/main.cpp
deleted file mode 100644
index 358fcb4d8d..0000000000
--- a/examples/particles/affectors/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(affectors)
diff --git a/examples/particles/customparticle/customparticle.pro b/examples/particles/customparticle/customparticle.pro
deleted file mode 100644
index 80043799b0..0000000000
--- a/examples/particles/customparticle/customparticle.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
-qml.files = customparticle.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
-sources.files = $$SOURCES customparticle.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/customparticle/main.cpp b/examples/particles/customparticle/main.cpp
deleted file mode 100644
index ec5619c6f0..0000000000
--- a/examples/particles/customparticle/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(customparticle)
diff --git a/examples/particles/emitters/emitters.pro b/examples/particles/emitters/emitters.pro
deleted file mode 100644
index aae8e83c71..0000000000
--- a/examples/particles/emitters/emitters.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
-qml.files = emitters.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
-sources.files = $$SOURCES emitters.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/emitters/main.cpp b/examples/particles/emitters/main.cpp
deleted file mode 100644
index 01aff50ea3..0000000000
--- a/examples/particles/emitters/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(emitters)
diff --git a/examples/particles/imageparticle/imageparticle.pro b/examples/particles/imageparticle/imageparticle.pro
deleted file mode 100644
index 17d4816138..0000000000
--- a/examples/particles/imageparticle/imageparticle.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
-qml.files = imageparticle.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
-sources.files = $$SOURCES imageparticle.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/imageparticle/main.cpp b/examples/particles/imageparticle/main.cpp
deleted file mode 100644
index 081aec03d7..0000000000
--- a/examples/particles/imageparticle/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(imageparticle)
diff --git a/examples/particles/system/main.cpp b/examples/particles/system/main.cpp
deleted file mode 100644
index ea67283822..0000000000
--- a/examples/particles/system/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(system)
diff --git a/examples/particles/system/system.pro b/examples/particles/system/system.pro
deleted file mode 100644
index 7cc3165483..0000000000
--- a/examples/particles/system/system.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
-qml.files = system.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
-sources.files = $$SOURCES system.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro
deleted file mode 100644
index 135f4da627..0000000000
--- a/examples/qml/imageprovider/imageprovider.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += qml quick
-
-DESTDIR = ImageProviderCore
-TARGET  = qmlimageproviderplugin
-
-SOURCES += imageprovider.cpp
-
-OTHER_FILES += imageprovider.json
-
-sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
-
-ImageProviderCore_sources.files = \
-    ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
-
-INSTALLS = sources ImageProviderCore_sources target
diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 3195dfd7a2..222cc71c46 100644
--- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -3,8 +3,5 @@ QT += qml quick network
 SOURCES += main.cpp 
 RESOURCES += networkaccessmanagerfactory.qrc
 
-sources.files = $$SOURCES $$RESOURCES networkaccessmanagerfactory.pro view.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/networkaccessmanagerfactory
-target.path = $$sources.path
-
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory
+INSTALLS = target
diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro
index 66af7d3c07..d86df72962 100644
--- a/examples/qml/plugins/plugins.pro
+++ b/examples/qml/plugins/plugins.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR = imports/TimeExample
@@ -7,7 +7,7 @@ TARGET  = qmlqtimeexampleplugin
 
 SOURCES += plugin.cpp
 
-qdeclarativesources.files += \
+pluginfiles.files += \
     imports/TimeExample/qmldir \
     imports/TimeExample/center.png \
     imports/TimeExample/clock.png \
@@ -15,11 +15,10 @@ qdeclarativesources.files += \
     imports/TimeExample/hour.png \
     imports/TimeExample/minute.png
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample
+qml.files = plugins.qml
+qml.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample
+pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample
 
-sources.files += plugins.pro plugin.cpp plugins.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample
-
-INSTALLS += qdeclarativesources sources target
+INSTALLS += target qml pluginfiles
 
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index 6bc620fbf0..e6591c895f 100644
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -1,12 +1,13 @@
 TEMPLATE = subdirs
 
-SUBDIRS +=imageprovider \
-          plugins \
+SUBDIRS += \
           networkaccessmanagerfactory \
+          plugins \
           referenceexamples \
-          shell
+          shell \
+          xmlhttprequest
 
-#Install
-sources.files = qml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml
-INSTALLS += sources
+EXAMPLE_FILES = \
+    dynamicscene \
+    i18n \
+    locale
diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro
index a6c2fc65ed..86c830bda9 100644
--- a/examples/qml/referenceexamples/adding/adding.pro
+++ b/examples/qml/referenceexamples/adding/adding.pro
@@ -5,7 +5,5 @@ SOURCES += main.cpp \
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/adding
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro
index 247db55cee..1225a5fcfd 100644
--- a/examples/qml/referenceexamples/attached/attached.pro
+++ b/examples/qml/referenceexamples/attached/attached.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/attached
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro
index 86787c7654..3c1f9565ed 100644
--- a/examples/qml/referenceexamples/binding/binding.pro
+++ b/examples/qml/referenceexamples/binding/binding.pro
@@ -7,9 +7,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h \
            happybirthdaysong.h
-
 RESOURCES += binding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/binding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/binding
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro
index e053ac21cb..c501b9cda2 100644
--- a/examples/qml/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/referenceexamples/coercion/coercion.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/coercion
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/coercion
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro
index 80bee64461..db4b88413b 100644
--- a/examples/qml/referenceexamples/default/default.pro
+++ b/examples/qml/referenceexamples/default/default.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/default
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/default
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro
index 5b21d90447..b38a1753b9 100644
--- a/examples/qml/referenceexamples/extended/extended.pro
+++ b/examples/qml/referenceexamples/extended/extended.pro
@@ -5,7 +5,5 @@ SOURCES += main.cpp \
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/extended
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/extended
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro
index afd1c15668..7014d9680d 100644
--- a/examples/qml/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/referenceexamples/grouped/grouped.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/grouped
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/grouped
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro
index a7dd996532..c1be0713e6 100644
--- a/examples/qml/referenceexamples/methods/methods.pro
+++ b/examples/qml/referenceexamples/methods/methods.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/methods
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/methods
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro
index c1cf877e65..cd1ffeddcc 100644
--- a/examples/qml/referenceexamples/properties/properties.pro
+++ b/examples/qml/referenceexamples/properties/properties.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/properties
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/properties
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 5f514bc1db..4bfbd488ea 100644
--- a/examples/qml/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
@@ -13,7 +13,3 @@ SUBDIRS += \
     methods
 
 !contains(QT_CONFIG, no-widgets): SUBDIRS += extended
-
-sources.files = referenceexamples.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples
-INSTALLS += sources
diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro
index 5a021ebae0..81692d3676 100644
--- a/examples/qml/referenceexamples/signal/signal.pro
+++ b/examples/qml/referenceexamples/signal/signal.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/signal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/signal
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro
index d7aafb7d10..4ec77ff83b 100644
--- a/examples/qml/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/referenceexamples/valuesource/valuesource.pro
@@ -9,7 +9,5 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/valuesource
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/valuesource
+INSTALLS += target
diff --git a/examples/qml/shell/shell.pro b/examples/qml/shell/shell.pro
index b57d550d31..da97590189 100644
--- a/examples/qml/shell/shell.pro
+++ b/examples/qml/shell/shell.pro
@@ -5,7 +5,5 @@ mac:CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/shell
-sources.files = $$SOURCES shell.pro
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/shell
+INSTALLS += target
diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp
index 976a462464..8bf39fcf62 100644
--- a/examples/qml/xmlhttprequest/main.cpp
+++ b/examples/qml/xmlhttprequest/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
\ No newline at end of file
+#include "../../quick/shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(qml/xmlhttprequest/xmlhttprequest)
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro
index bb7fae66bf..3e20d3781c 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.pro
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro
@@ -2,8 +2,12 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    xmlhttprequest.qrc \
+    ../../quick/shared/quick_shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
-qml.files = xmlhttprequest.qml get.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
-INSTALLS += target qml
+EXAMPLE_FILES = \
+    data.xml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
+INSTALLS += target
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml
index b9bf4548cb..b483ac1aa0 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.qml
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../../quick/shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qrc b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
new file mode 100644
index 0000000000..532e508a90
--- /dev/null
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/qml/xmlhttprequest">
+        <file>xmlhttprequest.qml</file>
+        <file>get.qml</file>
+        <file>data.xml</file>
+    </qresource>
+</RCC>
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
index dbf032e11c..3ade5f2cbd 100644
--- a/examples/qmltest/qmltest/qmltest.pro
+++ b/examples/qmltest/qmltest/qmltest.pro
@@ -5,7 +5,7 @@ SOURCES += tst_qmltest.cpp
 
 # Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here
 # so this one will end up in the examples tree.
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qmltest
-sources.files = $$SOURCES qmltest.pro *.qml
-sources.path = $$target.path
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/qmltest
+qml.files = tst_basic.qml tst_item.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest
+INSTALLS += target qml
diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro
index 681e44b307..3f4ea644ac 100644
--- a/examples/quick/accessibility/accessibility.pro
+++ b/examples/quick/accessibility/accessibility.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += accessibility.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
-qml.files = accessibility.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
-sources.files = $$SOURCES accessibility.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility
+INSTALLS += target
diff --git a/examples/quick/accessibility/accessibility.qrc b/examples/quick/accessibility/accessibility.qrc
new file mode 100644
index 0000000000..462a9a590c
--- /dev/null
+++ b/examples/quick/accessibility/accessibility.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/accessibility">
+        <file>accessibility.qml</file>
+        <file>content/Button.qml</file>
+        <file>content/Checkbox.qml</file>
+        <file>content/Slider.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/accessibility/main.cpp b/examples/quick/accessibility/main.cpp
index 801ccdcf19..07b2e719aa 100644
--- a/examples/quick/accessibility/main.cpp
+++ b/examples/quick/accessibility/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(accessibility)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(accessibility/accessibility)
diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro
index edc767d709..70d71688a4 100644
--- a/examples/quick/animation/animation.pro
+++ b/examples/quick/animation/animation.pro
@@ -3,10 +3,9 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
-qml.files = animation.qml  basics  behaviors  easing pathanimation  pathinterpolator  states
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
-sources.files = $$SOURCES animation.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+RESOURCES += \
+    ../shared/shared.qrc \
+    animation.qrc
 
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/animation
+INSTALLS += target
diff --git a/examples/quick/animation/animation.qml b/examples/quick/animation/animation.qml
index a17967a496..8a1b8558ee 100644
--- a/examples/quick/animation/animation.qml
+++ b/examples/quick/animation/animation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/animation/animation.qrc b/examples/quick/animation/animation.qrc
new file mode 100644
index 0000000000..d1217ac378
--- /dev/null
+++ b/examples/quick/animation/animation.qrc
@@ -0,0 +1,22 @@
+<RCC>
+    <qresource prefix="/animation">
+        <file>animation.qml</file>
+        <file>basics/images/face-smile.png</file>
+        <file>basics/images/moon.png</file>
+        <file>basics/images/shadow.png</file>
+        <file>basics/images/star.png</file>
+        <file>basics/images/sun.png</file>
+        <file>basics/color-animation.qml</file>
+        <file>basics/property-animation.qml</file>
+        <file>behaviors/behavior-example.qml</file>
+        <file>behaviors/SideRect.qml</file>
+        <file>behaviors/tvtennis.qml</file>
+        <file>behaviors/wigglytext.qml</file>
+        <file>easing/easing.qml</file>
+        <file>pathanimation/pathanimation.qml</file>
+        <file>pathinterpolator/pathinterpolator.qml</file>
+        <file>states/qt-logo.png</file>
+        <file>states/states.qml</file>
+        <file>states/transitions.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/animation/behaviors/wigglytext.qml b/examples/quick/animation/behaviors/wigglytext.qml
index 13d04d539c..1bafebcebc 100644
--- a/examples/quick/animation/behaviors/wigglytext.qml
+++ b/examples/quick/animation/behaviors/wigglytext.qml
@@ -96,7 +96,7 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
-                drag.target: letter; drag.axis: Drag.XandYAxis
+                drag.target: letter; drag.axis: Drag.XAndYAxis
                 onPressed: letter.color = "#dddddd"
                 onReleased: letter.color = "#999999"
             }
diff --git a/examples/quick/animation/main.cpp b/examples/quick/animation/main.cpp
index faccffc27a..28bf080c46 100644
--- a/examples/quick/animation/main.cpp
+++ b/examples/quick/animation/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(animation)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(animation/animation)
diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro
index 9f024237a2..4c4140407b 100644
--- a/examples/quick/canvas/canvas.pro
+++ b/examples/quick/canvas/canvas.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    canvas.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
-qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
-sources.files = $$SOURCES canvas.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas
+INSTALLS += target
diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml
index 65707f7381..e1e8724149 100644
--- a/examples/quick/canvas/canvas.qml
+++ b/examples/quick/canvas/canvas.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/canvas/canvas.qrc b/examples/quick/canvas/canvas.qrc
new file mode 100644
index 0000000000..06d39f3624
--- /dev/null
+++ b/examples/quick/canvas/canvas.qrc
@@ -0,0 +1,32 @@
+<RCC>
+    <qresource prefix="/canvas">
+        <file>canvas.qml</file>
+        <file>bezierCurve/bezierCurve.qml</file>
+        <file>clip/clip.qml</file>
+        <file>contents/Button.qml</file>
+        <file>contents/qt-logo.png</file>
+        <file>contents/ScrollBar.qml</file>
+        <file>contents/Slider.qml</file>
+        <file>contents/TitleBar.qml</file>
+        <file>contents/ToolBar.qml</file>
+        <file>contents/images/button-pressed.png</file>
+        <file>contents/images/button.png</file>
+        <file>contents/images/default.svg</file>
+        <file>contents/images/gloss.png</file>
+        <file>contents/images/lineedit.png</file>
+        <file>contents/images/lineedit.sci</file>
+        <file>contents/images/quit.png</file>
+        <file>contents/images/stripes.png</file>
+        <file>contents/images/titlebar.png</file>
+        <file>contents/images/titlebar.sci</file>
+        <file>contents/images/toolbutton.png</file>
+        <file>contents/images/toolbutton.sci</file>
+        <file>quadraticCurveTo/quadraticCurveTo.qml</file>
+        <file>roundedrect/roundedrect.qml</file>
+        <file>smile/smile.qml</file>
+        <file>squircle/squircle.png</file>
+        <file>squircle/squircle.qml</file>
+        <file>tiger/tiger.js</file>
+        <file>tiger/tiger.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/canvas/main.cpp b/examples/quick/canvas/main.cpp
index acbef7551b..9b2fda197d 100644
--- a/examples/quick/canvas/main.cpp
+++ b/examples/quick/canvas/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(canvas)
\ No newline at end of file
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(canvas/canvas)
diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro
index a401042d4e..1e0a2aed49 100644
--- a/examples/quick/customitems/customitems.pro
+++ b/examples/quick/customitems/customitems.pro
@@ -1,17 +1,14 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-    #dialcontrol \
-    #flipable \
     painteditem \
-    #progressbar \
-    #scrollbar \
-    #searchbox \
-    #slideswitch \
-    #spinner \
-    #tabwidget \
     maskedmousearea
 
-# install
-sources.files = customitems.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems
-INSTALLS += sources
+EXAMPLE_FILES = \
+    dialcontrol \
+    flipable \
+    progressbar \
+    scrollbar \
+    searchbox \
+    slideswitch \
+    spinner \
+    tabwidget
diff --git a/examples/quick/customitems/maskedmousearea/main.cpp b/examples/quick/customitems/maskedmousearea/main.cpp
index a0ca0b6db7..a0235fc4d4 100644
--- a/examples/quick/customitems/maskedmousearea/main.cpp
+++ b/examples/quick/customitems/maskedmousearea/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
 
     qmlRegisterType<MaskedMouseArea>("Example", 1, 0, "MaskedMouseArea");
 
-    view.setSource(QUrl::fromLocalFile("maskedmousearea.qml"));
+    view.setSource(QUrl("qrc:///customitems/maskedmousearea/maskedmousearea.qml"));
     view.show();
     return app.exec();
 }
diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
index b812508bd7..fe5c05ce61 100644
--- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
@@ -7,9 +7,7 @@ HEADERS += maskedmousearea.h
 SOURCES += main.cpp \
            maskedmousearea.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea
-qml.files = maskedmousearea.qml images
-qml.path = $$target.path
-sources.files = $$SOURCES $$HEADERS maskedmousearea.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+RESOURCES += maskedmousearea.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/maskedmousearea
+INSTALLS += target
diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc b/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc
new file mode 100644
index 0000000000..3cc3955e56
--- /dev/null
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/customitems/maskedmousearea">
+        <file>maskedmousearea.qml</file>
+        <file>images/cloud_1.png</file>
+        <file>images/cloud_2.png</file>
+        <file>images/moon.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro
index 846ad6307d..77e4d146e1 100644
--- a/examples/quick/customitems/painteditem/painteditem.pro
+++ b/examples/quick/customitems/painteditem/painteditem.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml quick
 
 TARGET = qmltextballoonplugin
@@ -9,16 +9,12 @@ HEADERS += TextBalloonPlugin/plugin.h \
 
 SOURCES += textballoon.cpp
 
-OTHER_FILES += textballoon.json
+RESOURCES += painteditem.qrc
 
 DESTDIR = TextBalloonPlugin
 
-INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/
-qdeclarativesources.files += \
-    TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h
-qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin
-sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro
-sources.path = $$INSTALL_PATH
-target.path = $$INSTALL_PATH/TextBalloonPlugin
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin
+qmldir.files = TextBalloonPlugin/qmldir
+qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin
 
-INSTALLS = qdeclarativesources sources target
+INSTALLS += qmldir target
diff --git a/examples/quick/customitems/painteditem/painteditem.qrc b/examples/quick/customitems/painteditem/painteditem.qrc
new file mode 100644
index 0000000000..c240be02a1
--- /dev/null
+++ b/examples/quick/customitems/painteditem/painteditem.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/painteditem">
+        <file>textballoon.h</file>
+        <file>textballoons.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/demos/calqlatr/calqlatr.pro b/examples/quick/demos/calqlatr/calqlatr.pro
new file mode 100644
index 0000000000..1b002a5f27
--- /dev/null
+++ b/examples/quick/demos/calqlatr/calqlatr.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+
+RESOURCES += calqlatr.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr
+INSTALLS += target
diff --git a/examples/demos/calqlatr/calqlatr.qml b/examples/quick/demos/calqlatr/calqlatr.qml
index 7640fbd738..7640fbd738 100644
--- a/examples/demos/calqlatr/calqlatr.qml
+++ b/examples/quick/demos/calqlatr/calqlatr.qml
diff --git a/examples/demos/calqlatr/calqlatr.qmlproject b/examples/quick/demos/calqlatr/calqlatr.qmlproject
index ce2d59d310..ce2d59d310 100644
--- a/examples/demos/calqlatr/calqlatr.qmlproject
+++ b/examples/quick/demos/calqlatr/calqlatr.qmlproject
diff --git a/examples/quick/demos/calqlatr/calqlatr.qrc b/examples/quick/demos/calqlatr/calqlatr.qrc
new file mode 100644
index 0000000000..fda7d35d7e
--- /dev/null
+++ b/examples/quick/demos/calqlatr/calqlatr.qrc
@@ -0,0 +1,22 @@
+<RCC>
+    <qresource prefix="/demos/calqlatr">
+        <file>calqlatr.qml</file>
+        <file>content/Button.qml</file>
+        <file>content/calculator.js</file>
+        <file>content/Display.qml</file>
+        <file>content/NumberPad.qml</file>
+        <file>content/StyleLabel.qml</file>
+        <file>content/audio/touch.wav</file>
+        <file>content/images/icon-back.png</file>
+        <file>content/images/icon-close.png</file>
+        <file>content/images/icon-settings.png</file>
+        <file>content/images/logo.png</file>
+        <file>content/images/paper-edge-left.png</file>
+        <file>content/images/paper-edge-right.png</file>
+        <file>content/images/paper-grip.png</file>
+        <file>content/images/settings-selected-a.png</file>
+        <file>content/images/settings-selected-b.png</file>
+        <file>content/images/touch-green.png</file>
+        <file>content/images/touch-white.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/demos/calqlatr/content/Button.qml b/examples/quick/demos/calqlatr/content/Button.qml
index c355c2d105..c355c2d105 100644
--- a/examples/demos/calqlatr/content/Button.qml
+++ b/examples/quick/demos/calqlatr/content/Button.qml
diff --git a/examples/demos/calqlatr/content/Display.qml b/examples/quick/demos/calqlatr/content/Display.qml
index 3c1d9c0cd5..3c1d9c0cd5 100644
--- a/examples/demos/calqlatr/content/Display.qml
+++ b/examples/quick/demos/calqlatr/content/Display.qml
diff --git a/examples/demos/calqlatr/content/NumberPad.qml b/examples/quick/demos/calqlatr/content/NumberPad.qml
index 853c7631c9..853c7631c9 100644
--- a/examples/demos/calqlatr/content/NumberPad.qml
+++ b/examples/quick/demos/calqlatr/content/NumberPad.qml
diff --git a/examples/demos/calqlatr/content/StyleLabel.qml b/examples/quick/demos/calqlatr/content/StyleLabel.qml
index 3bdea86129..3bdea86129 100644
--- a/examples/demos/calqlatr/content/StyleLabel.qml
+++ b/examples/quick/demos/calqlatr/content/StyleLabel.qml
diff --git a/examples/demos/calqlatr/content/audio/touch.wav b/examples/quick/demos/calqlatr/content/audio/touch.wav
index 94cccb7546..94cccb7546 100644
--- a/examples/demos/calqlatr/content/audio/touch.wav
+++ b/examples/quick/demos/calqlatr/content/audio/touch.wav
diff --git a/examples/demos/calqlatr/content/calculator.js b/examples/quick/demos/calqlatr/content/calculator.js
index 843ef39c02..843ef39c02 100644
--- a/examples/demos/calqlatr/content/calculator.js
+++ b/examples/quick/demos/calqlatr/content/calculator.js
diff --git a/examples/demos/calqlatr/content/images/icon-back.png b/examples/quick/demos/calqlatr/content/images/icon-back.png
index 2989ee2e35..2989ee2e35 100644
--- a/examples/demos/calqlatr/content/images/icon-back.png
+++ b/examples/quick/demos/calqlatr/content/images/icon-back.png
diff --git a/examples/demos/calqlatr/content/images/icon-close.png b/examples/quick/demos/calqlatr/content/images/icon-close.png
index 3e21248232..3e21248232 100644
--- a/examples/demos/calqlatr/content/images/icon-close.png
+++ b/examples/quick/demos/calqlatr/content/images/icon-close.png
diff --git a/examples/demos/calqlatr/content/images/icon-settings.png b/examples/quick/demos/calqlatr/content/images/icon-settings.png
index 98e662f53f..98e662f53f 100644
--- a/examples/demos/calqlatr/content/images/icon-settings.png
+++ b/examples/quick/demos/calqlatr/content/images/icon-settings.png
diff --git a/examples/demos/calqlatr/content/images/logo.png b/examples/quick/demos/calqlatr/content/images/logo.png
index 6bc65610bc..6bc65610bc 100644
--- a/examples/demos/calqlatr/content/images/logo.png
+++ b/examples/quick/demos/calqlatr/content/images/logo.png
diff --git a/examples/demos/calqlatr/content/images/paper-edge-left.png b/examples/quick/demos/calqlatr/content/images/paper-edge-left.png
index ca29a3ae10..ca29a3ae10 100644
--- a/examples/demos/calqlatr/content/images/paper-edge-left.png
+++ b/examples/quick/demos/calqlatr/content/images/paper-edge-left.png
diff --git a/examples/demos/calqlatr/content/images/paper-edge-right.png b/examples/quick/demos/calqlatr/content/images/paper-edge-right.png
index 7c2da7b930..7c2da7b930 100644
--- a/examples/demos/calqlatr/content/images/paper-edge-right.png
+++ b/examples/quick/demos/calqlatr/content/images/paper-edge-right.png
diff --git a/examples/demos/calqlatr/content/images/paper-grip.png b/examples/quick/demos/calqlatr/content/images/paper-grip.png
index 953c408bca..953c408bca 100644
--- a/examples/demos/calqlatr/content/images/paper-grip.png
+++ b/examples/quick/demos/calqlatr/content/images/paper-grip.png
diff --git a/examples/demos/calqlatr/content/images/settings-selected-a.png b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png
index e08ddface8..e08ddface8 100644
--- a/examples/demos/calqlatr/content/images/settings-selected-a.png
+++ b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png
diff --git a/examples/demos/calqlatr/content/images/settings-selected-b.png b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png
index d9aa7e3431..d9aa7e3431 100644
--- a/examples/demos/calqlatr/content/images/settings-selected-b.png
+++ b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png
diff --git a/examples/demos/calqlatr/content/images/touch-green.png b/examples/quick/demos/calqlatr/content/images/touch-green.png
index 64dbde66b1..64dbde66b1 100644
--- a/examples/demos/calqlatr/content/images/touch-green.png
+++ b/examples/quick/demos/calqlatr/content/images/touch-green.png
diff --git a/examples/demos/calqlatr/content/images/touch-white.png b/examples/quick/demos/calqlatr/content/images/touch-white.png
index bb02b000cf..bb02b000cf 100644
--- a/examples/demos/calqlatr/content/images/touch-white.png
+++ b/examples/quick/demos/calqlatr/content/images/touch-white.png
diff --git a/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png b/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
index af67f63dd1..af67f63dd1 100644
--- a/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
+++ b/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
diff --git a/examples/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
index 366f01ea2c..366f01ea2c 100644
--- a/examples/demos/calqlatr/doc/src/calqlatr.qdoc
+++ b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
diff --git a/examples/demos/calqlatr/main.cpp b/examples/quick/demos/calqlatr/main.cpp
index 9000bfc7d7..65bfc97f9a 100644
--- a/examples/demos/calqlatr/main.cpp
+++ b/examples/quick/demos/calqlatr/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(calqlatr)
+DECLARATIVE_EXAMPLE_MAIN(demos/calqlatr/calqlatr)
diff --git a/examples/demos/clocks/clocks.qml b/examples/quick/demos/clocks/clocks.qml
index 020fe32908..020fe32908 100644
--- a/examples/demos/clocks/clocks.qml
+++ b/examples/quick/demos/clocks/clocks.qml
diff --git a/examples/demos/clocks/content/Clock.qml b/examples/quick/demos/clocks/content/Clock.qml
index 05317b1151..05317b1151 100644
--- a/examples/demos/clocks/content/Clock.qml
+++ b/examples/quick/demos/clocks/content/Clock.qml
diff --git a/examples/demos/clocks/content/arrow.png b/examples/quick/demos/clocks/content/arrow.png
index e437312217..e437312217 100644
--- a/examples/demos/clocks/content/arrow.png
+++ b/examples/quick/demos/clocks/content/arrow.png
diff --git a/examples/demos/clocks/content/background.png b/examples/quick/demos/clocks/content/background.png
index a885950862..a885950862 100644
--- a/examples/demos/clocks/content/background.png
+++ b/examples/quick/demos/clocks/content/background.png
diff --git a/examples/demos/clocks/content/center.png b/examples/quick/demos/clocks/content/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/demos/clocks/content/center.png
+++ b/examples/quick/demos/clocks/content/center.png
diff --git a/examples/demos/clocks/content/clock-night.png b/examples/quick/demos/clocks/content/clock-night.png
index cc7151a397..cc7151a397 100644
--- a/examples/demos/clocks/content/clock-night.png
+++ b/examples/quick/demos/clocks/content/clock-night.png
diff --git a/examples/demos/clocks/content/clock.png b/examples/quick/demos/clocks/content/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/demos/clocks/content/clock.png
+++ b/examples/quick/demos/clocks/content/clock.png
diff --git a/examples/demos/clocks/content/hour.png b/examples/quick/demos/clocks/content/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/demos/clocks/content/hour.png
+++ b/examples/quick/demos/clocks/content/hour.png
diff --git a/examples/demos/clocks/content/minute.png b/examples/quick/demos/clocks/content/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/demos/clocks/content/minute.png
+++ b/examples/quick/demos/clocks/content/minute.png
diff --git a/examples/demos/clocks/content/quit.png b/examples/quick/demos/clocks/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/demos/clocks/content/quit.png
+++ b/examples/quick/demos/clocks/content/quit.png
diff --git a/examples/demos/clocks/content/second.png b/examples/quick/demos/clocks/content/second.png
index 4aa9fb5e8e..4aa9fb5e8e 100644
--- a/examples/demos/clocks/content/second.png
+++ b/examples/quick/demos/clocks/content/second.png
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
new file mode 100644
index 0000000000..474b5b1bc0
--- /dev/null
+++ b/examples/quick/demos/demos.pro
@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+SUBDIRS = samegame \
+            calqlatr \
+            tweetsearch \
+            maroon \
+            stocqt
+
+EXAMPLE_FILES = \
+    clocks \
+    photoviewer \
+    rssnews
diff --git a/examples/demos/maroon/content/BuildButton.qml b/examples/quick/demos/maroon/content/BuildButton.qml
index 49641fcecc..49641fcecc 100644
--- a/examples/demos/maroon/content/BuildButton.qml
+++ b/examples/quick/demos/maroon/content/BuildButton.qml
diff --git a/examples/demos/maroon/content/GameCanvas.qml b/examples/quick/demos/maroon/content/GameCanvas.qml
index 5e6e963e84..5e6e963e84 100644
--- a/examples/demos/maroon/content/GameCanvas.qml
+++ b/examples/quick/demos/maroon/content/GameCanvas.qml
diff --git a/examples/demos/maroon/content/GameOverScreen.qml b/examples/quick/demos/maroon/content/GameOverScreen.qml
index dfb439fbb9..dfb439fbb9 100644
--- a/examples/demos/maroon/content/GameOverScreen.qml
+++ b/examples/quick/demos/maroon/content/GameOverScreen.qml
diff --git a/examples/demos/maroon/content/InfoBar.qml b/examples/quick/demos/maroon/content/InfoBar.qml
index 36303fc4fe..36303fc4fe 100644
--- a/examples/demos/maroon/content/InfoBar.qml
+++ b/examples/quick/demos/maroon/content/InfoBar.qml
diff --git a/examples/demos/maroon/content/NewGameScreen.qml b/examples/quick/demos/maroon/content/NewGameScreen.qml
index 495e3aaa8e..495e3aaa8e 100644
--- a/examples/demos/maroon/content/NewGameScreen.qml
+++ b/examples/quick/demos/maroon/content/NewGameScreen.qml
diff --git a/examples/demos/maroon/content/SoundEffect.qml b/examples/quick/demos/maroon/content/SoundEffect.qml
index d286a397c1..d286a397c1 100644
--- a/examples/demos/maroon/content/SoundEffect.qml
+++ b/examples/quick/demos/maroon/content/SoundEffect.qml
diff --git a/examples/demos/maroon/content/audio/bomb-action.wav b/examples/quick/demos/maroon/content/audio/bomb-action.wav
index b334dc1e5b..b334dc1e5b 100644
--- a/examples/demos/maroon/content/audio/bomb-action.wav
+++ b/examples/quick/demos/maroon/content/audio/bomb-action.wav
diff --git a/examples/demos/maroon/content/audio/catch-action.wav b/examples/quick/demos/maroon/content/audio/catch-action.wav
index 3e22124abf..3e22124abf 100644
--- a/examples/demos/maroon/content/audio/catch-action.wav
+++ b/examples/quick/demos/maroon/content/audio/catch-action.wav
diff --git a/examples/demos/maroon/content/audio/catch.wav b/examples/quick/demos/maroon/content/audio/catch.wav
index d3eade87f8..d3eade87f8 100644
--- a/examples/demos/maroon/content/audio/catch.wav
+++ b/examples/quick/demos/maroon/content/audio/catch.wav
diff --git a/examples/demos/maroon/content/audio/currency.wav b/examples/quick/demos/maroon/content/audio/currency.wav
index 0d9ef2c200..0d9ef2c200 100644
--- a/examples/demos/maroon/content/audio/currency.wav
+++ b/examples/quick/demos/maroon/content/audio/currency.wav
diff --git a/examples/demos/maroon/content/audio/factory-action.wav b/examples/quick/demos/maroon/content/audio/factory-action.wav
index a2ace6c221..a2ace6c221 100644
--- a/examples/demos/maroon/content/audio/factory-action.wav
+++ b/examples/quick/demos/maroon/content/audio/factory-action.wav
diff --git a/examples/demos/maroon/content/audio/melee-action.wav b/examples/quick/demos/maroon/content/audio/melee-action.wav
index d325af4700..d325af4700 100644
--- a/examples/demos/maroon/content/audio/melee-action.wav
+++ b/examples/quick/demos/maroon/content/audio/melee-action.wav
diff --git a/examples/demos/maroon/content/audio/projectile-action.wav b/examples/quick/demos/maroon/content/audio/projectile-action.wav
index 4e2284fceb..4e2284fceb 100644
--- a/examples/demos/maroon/content/audio/projectile-action.wav
+++ b/examples/quick/demos/maroon/content/audio/projectile-action.wav
diff --git a/examples/demos/maroon/content/audio/shooter-action.wav b/examples/quick/demos/maroon/content/audio/shooter-action.wav
index 3e12b9419a..3e12b9419a 100644
--- a/examples/demos/maroon/content/audio/shooter-action.wav
+++ b/examples/quick/demos/maroon/content/audio/shooter-action.wav
diff --git a/examples/demos/maroon/content/gfx/background.png b/examples/quick/demos/maroon/content/gfx/background.png
index d548b9314e..d548b9314e 100644
--- a/examples/demos/maroon/content/gfx/background.png
+++ b/examples/quick/demos/maroon/content/gfx/background.png
diff --git a/examples/demos/maroon/content/gfx/bomb-action.png b/examples/quick/demos/maroon/content/gfx/bomb-action.png
index 42da5d789f..42da5d789f 100644
--- a/examples/demos/maroon/content/gfx/bomb-action.png
+++ b/examples/quick/demos/maroon/content/gfx/bomb-action.png
diff --git a/examples/demos/maroon/content/gfx/bomb-idle.png b/examples/quick/demos/maroon/content/gfx/bomb-idle.png
index 3bd62e261d..3bd62e261d 100644
--- a/examples/demos/maroon/content/gfx/bomb-idle.png
+++ b/examples/quick/demos/maroon/content/gfx/bomb-idle.png
diff --git a/examples/demos/maroon/content/gfx/bomb.png b/examples/quick/demos/maroon/content/gfx/bomb.png
index 380da7d1a5..380da7d1a5 100644
--- a/examples/demos/maroon/content/gfx/bomb.png
+++ b/examples/quick/demos/maroon/content/gfx/bomb.png
diff --git a/examples/demos/maroon/content/gfx/button-help.png b/examples/quick/demos/maroon/content/gfx/button-help.png
index aecebc1275..aecebc1275 100644
--- a/examples/demos/maroon/content/gfx/button-help.png
+++ b/examples/quick/demos/maroon/content/gfx/button-help.png
diff --git a/examples/demos/maroon/content/gfx/button-play.png b/examples/quick/demos/maroon/content/gfx/button-play.png
index 6cdad6c845..6cdad6c845 100644
--- a/examples/demos/maroon/content/gfx/button-play.png
+++ b/examples/quick/demos/maroon/content/gfx/button-play.png
diff --git a/examples/demos/maroon/content/gfx/catch-action.png b/examples/quick/demos/maroon/content/gfx/catch-action.png
index 78ca9fe1cc..78ca9fe1cc 100644
--- a/examples/demos/maroon/content/gfx/catch-action.png
+++ b/examples/quick/demos/maroon/content/gfx/catch-action.png
diff --git a/examples/demos/maroon/content/gfx/catch.png b/examples/quick/demos/maroon/content/gfx/catch.png
index b7620fe3de..b7620fe3de 100644
--- a/examples/demos/maroon/content/gfx/catch.png
+++ b/examples/quick/demos/maroon/content/gfx/catch.png
diff --git a/examples/demos/maroon/content/gfx/cloud.png b/examples/quick/demos/maroon/content/gfx/cloud.png
index d7c35f8555..d7c35f8555 100644
--- a/examples/demos/maroon/content/gfx/cloud.png
+++ b/examples/quick/demos/maroon/content/gfx/cloud.png
diff --git a/examples/demos/maroon/content/gfx/currency.png b/examples/quick/demos/maroon/content/gfx/currency.png
index 1571341f6c..1571341f6c 100644
--- a/examples/demos/maroon/content/gfx/currency.png
+++ b/examples/quick/demos/maroon/content/gfx/currency.png
diff --git a/examples/demos/maroon/content/gfx/dialog-bomb.png b/examples/quick/demos/maroon/content/gfx/dialog-bomb.png
index 708d916ad7..708d916ad7 100644
--- a/examples/demos/maroon/content/gfx/dialog-bomb.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog-bomb.png
diff --git a/examples/demos/maroon/content/gfx/dialog-factory.png b/examples/quick/demos/maroon/content/gfx/dialog-factory.png
index d2e2a48e31..d2e2a48e31 100644
--- a/examples/demos/maroon/content/gfx/dialog-factory.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog-factory.png
diff --git a/examples/demos/maroon/content/gfx/dialog-melee.png b/examples/quick/demos/maroon/content/gfx/dialog-melee.png
index 069d18d477..069d18d477 100644
--- a/examples/demos/maroon/content/gfx/dialog-melee.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog-melee.png
diff --git a/examples/demos/maroon/content/gfx/dialog-pointer.png b/examples/quick/demos/maroon/content/gfx/dialog-pointer.png
index 9b51a090f9..9b51a090f9 100644
--- a/examples/demos/maroon/content/gfx/dialog-pointer.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog-pointer.png
diff --git a/examples/demos/maroon/content/gfx/dialog-shooter.png b/examples/quick/demos/maroon/content/gfx/dialog-shooter.png
index af980caabd..af980caabd 100644
--- a/examples/demos/maroon/content/gfx/dialog-shooter.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog-shooter.png
diff --git a/examples/demos/maroon/content/gfx/dialog.png b/examples/quick/demos/maroon/content/gfx/dialog.png
index d528ba78d1..d528ba78d1 100644
--- a/examples/demos/maroon/content/gfx/dialog.png
+++ b/examples/quick/demos/maroon/content/gfx/dialog.png
diff --git a/examples/demos/maroon/content/gfx/factory-action.png b/examples/quick/demos/maroon/content/gfx/factory-action.png
index 8981678267..8981678267 100644
--- a/examples/demos/maroon/content/gfx/factory-action.png
+++ b/examples/quick/demos/maroon/content/gfx/factory-action.png
diff --git a/examples/demos/maroon/content/gfx/factory-idle.png b/examples/quick/demos/maroon/content/gfx/factory-idle.png
index a145582c8f..a145582c8f 100644
--- a/examples/demos/maroon/content/gfx/factory-idle.png
+++ b/examples/quick/demos/maroon/content/gfx/factory-idle.png
diff --git a/examples/demos/maroon/content/gfx/factory.png b/examples/quick/demos/maroon/content/gfx/factory.png
index bfb9f3fb79..bfb9f3fb79 100644
--- a/examples/demos/maroon/content/gfx/factory.png
+++ b/examples/quick/demos/maroon/content/gfx/factory.png
diff --git a/examples/demos/maroon/content/gfx/grid.png b/examples/quick/demos/maroon/content/gfx/grid.png
index b59555247a..b59555247a 100644
--- a/examples/demos/maroon/content/gfx/grid.png
+++ b/examples/quick/demos/maroon/content/gfx/grid.png
diff --git a/examples/demos/maroon/content/gfx/help.png b/examples/quick/demos/maroon/content/gfx/help.png
index 4654e4c69b..4654e4c69b 100644
--- a/examples/demos/maroon/content/gfx/help.png
+++ b/examples/quick/demos/maroon/content/gfx/help.png
diff --git a/examples/demos/maroon/content/gfx/lifes.png b/examples/quick/demos/maroon/content/gfx/lifes.png
index 135310b38c..135310b38c 100644
--- a/examples/demos/maroon/content/gfx/lifes.png
+++ b/examples/quick/demos/maroon/content/gfx/lifes.png
diff --git a/examples/demos/maroon/content/gfx/logo-bubble.png b/examples/quick/demos/maroon/content/gfx/logo-bubble.png
index 136151caff..136151caff 100644
--- a/examples/demos/maroon/content/gfx/logo-bubble.png
+++ b/examples/quick/demos/maroon/content/gfx/logo-bubble.png
diff --git a/examples/demos/maroon/content/gfx/logo-fish.png b/examples/quick/demos/maroon/content/gfx/logo-fish.png
index c41833a0c9..c41833a0c9 100644
--- a/examples/demos/maroon/content/gfx/logo-fish.png
+++ b/examples/quick/demos/maroon/content/gfx/logo-fish.png
diff --git a/examples/demos/maroon/content/gfx/logo.png b/examples/quick/demos/maroon/content/gfx/logo.png
index 787ac99ce8..787ac99ce8 100644
--- a/examples/demos/maroon/content/gfx/logo.png
+++ b/examples/quick/demos/maroon/content/gfx/logo.png
diff --git a/examples/demos/maroon/content/gfx/melee-action.png b/examples/quick/demos/maroon/content/gfx/melee-action.png
index c53873bfcc..c53873bfcc 100644
--- a/examples/demos/maroon/content/gfx/melee-action.png
+++ b/examples/quick/demos/maroon/content/gfx/melee-action.png
diff --git a/examples/demos/maroon/content/gfx/melee-idle.png b/examples/quick/demos/maroon/content/gfx/melee-idle.png
index 621d9dff54..621d9dff54 100644
--- a/examples/demos/maroon/content/gfx/melee-idle.png
+++ b/examples/quick/demos/maroon/content/gfx/melee-idle.png
diff --git a/examples/demos/maroon/content/gfx/melee.png b/examples/quick/demos/maroon/content/gfx/melee.png
index ab240151f3..ab240151f3 100644
--- a/examples/demos/maroon/content/gfx/melee.png
+++ b/examples/quick/demos/maroon/content/gfx/melee.png
diff --git a/examples/demos/maroon/content/gfx/mob-idle.png b/examples/quick/demos/maroon/content/gfx/mob-idle.png
index dedacc7866..dedacc7866 100644
--- a/examples/demos/maroon/content/gfx/mob-idle.png
+++ b/examples/quick/demos/maroon/content/gfx/mob-idle.png
diff --git a/examples/demos/maroon/content/gfx/mob.png b/examples/quick/demos/maroon/content/gfx/mob.png
index 7569c3525a..7569c3525a 100644
--- a/examples/demos/maroon/content/gfx/mob.png
+++ b/examples/quick/demos/maroon/content/gfx/mob.png
diff --git a/examples/demos/maroon/content/gfx/points.png b/examples/quick/demos/maroon/content/gfx/points.png
index 1d2386dbe7..1d2386dbe7 100644
--- a/examples/demos/maroon/content/gfx/points.png
+++ b/examples/quick/demos/maroon/content/gfx/points.png
diff --git a/examples/demos/maroon/content/gfx/projectile-action.png b/examples/quick/demos/maroon/content/gfx/projectile-action.png
index aa2e650aeb..aa2e650aeb 100644
--- a/examples/demos/maroon/content/gfx/projectile-action.png
+++ b/examples/quick/demos/maroon/content/gfx/projectile-action.png
diff --git a/examples/demos/maroon/content/gfx/projectile.png b/examples/quick/demos/maroon/content/gfx/projectile.png
index c25a0c3890..c25a0c3890 100644
--- a/examples/demos/maroon/content/gfx/projectile.png
+++ b/examples/quick/demos/maroon/content/gfx/projectile.png
diff --git a/examples/demos/maroon/content/gfx/scores.png b/examples/quick/demos/maroon/content/gfx/scores.png
index af757fe64a..af757fe64a 100644
--- a/examples/demos/maroon/content/gfx/scores.png
+++ b/examples/quick/demos/maroon/content/gfx/scores.png
diff --git a/examples/demos/maroon/content/gfx/shooter-action.png b/examples/quick/demos/maroon/content/gfx/shooter-action.png
index 08e7e300ca..08e7e300ca 100644
--- a/examples/demos/maroon/content/gfx/shooter-action.png
+++ b/examples/quick/demos/maroon/content/gfx/shooter-action.png
diff --git a/examples/demos/maroon/content/gfx/shooter-idle.png b/examples/quick/demos/maroon/content/gfx/shooter-idle.png
index 663098d3b0..663098d3b0 100644
--- a/examples/demos/maroon/content/gfx/shooter-idle.png
+++ b/examples/quick/demos/maroon/content/gfx/shooter-idle.png
diff --git a/examples/demos/maroon/content/gfx/shooter.png b/examples/quick/demos/maroon/content/gfx/shooter.png
index d44401e055..d44401e055 100644
--- a/examples/demos/maroon/content/gfx/shooter.png
+++ b/examples/quick/demos/maroon/content/gfx/shooter.png
diff --git a/examples/demos/maroon/content/gfx/sunlight.png b/examples/quick/demos/maroon/content/gfx/sunlight.png
index d1c7042117..d1c7042117 100644
--- a/examples/demos/maroon/content/gfx/sunlight.png
+++ b/examples/quick/demos/maroon/content/gfx/sunlight.png
diff --git a/examples/demos/maroon/content/gfx/text-1.png b/examples/quick/demos/maroon/content/gfx/text-1.png
index 3ea399cc90..3ea399cc90 100644
--- a/examples/demos/maroon/content/gfx/text-1.png
+++ b/examples/quick/demos/maroon/content/gfx/text-1.png
diff --git a/examples/demos/maroon/content/gfx/text-2.png b/examples/quick/demos/maroon/content/gfx/text-2.png
index 934a481f3b..934a481f3b 100644
--- a/examples/demos/maroon/content/gfx/text-2.png
+++ b/examples/quick/demos/maroon/content/gfx/text-2.png
diff --git a/examples/demos/maroon/content/gfx/text-3.png b/examples/quick/demos/maroon/content/gfx/text-3.png
index 47523f55b8..47523f55b8 100644
--- a/examples/demos/maroon/content/gfx/text-3.png
+++ b/examples/quick/demos/maroon/content/gfx/text-3.png
diff --git a/examples/demos/maroon/content/gfx/text-blank.png b/examples/quick/demos/maroon/content/gfx/text-blank.png
index 4a687b24dc..4a687b24dc 100644
--- a/examples/demos/maroon/content/gfx/text-blank.png
+++ b/examples/quick/demos/maroon/content/gfx/text-blank.png
diff --git a/examples/demos/maroon/content/gfx/text-gameover.png b/examples/quick/demos/maroon/content/gfx/text-gameover.png
index 4f53ef0b29..4f53ef0b29 100644
--- a/examples/demos/maroon/content/gfx/text-gameover.png
+++ b/examples/quick/demos/maroon/content/gfx/text-gameover.png
diff --git a/examples/demos/maroon/content/gfx/text-go.png b/examples/quick/demos/maroon/content/gfx/text-go.png
index bfc26f71fc..bfc26f71fc 100644
--- a/examples/demos/maroon/content/gfx/text-go.png
+++ b/examples/quick/demos/maroon/content/gfx/text-go.png
diff --git a/examples/demos/maroon/content/gfx/wave.png b/examples/quick/demos/maroon/content/gfx/wave.png
index f97426c4e7..f97426c4e7 100644
--- a/examples/demos/maroon/content/gfx/wave.png
+++ b/examples/quick/demos/maroon/content/gfx/wave.png
diff --git a/examples/demos/maroon/content/logic.js b/examples/quick/demos/maroon/content/logic.js
index dd76b7e073..dd76b7e073 100644
--- a/examples/demos/maroon/content/logic.js
+++ b/examples/quick/demos/maroon/content/logic.js
diff --git a/examples/demos/maroon/content/mobs/MobBase.qml b/examples/quick/demos/maroon/content/mobs/MobBase.qml
index d4ece660ed..d4ece660ed 100644
--- a/examples/demos/maroon/content/mobs/MobBase.qml
+++ b/examples/quick/demos/maroon/content/mobs/MobBase.qml
diff --git a/examples/demos/maroon/content/towers/Bomb.qml b/examples/quick/demos/maroon/content/towers/Bomb.qml
index 00437f468f..00437f468f 100644
--- a/examples/demos/maroon/content/towers/Bomb.qml
+++ b/examples/quick/demos/maroon/content/towers/Bomb.qml
diff --git a/examples/demos/maroon/content/towers/Factory.qml b/examples/quick/demos/maroon/content/towers/Factory.qml
index b34a18498a..b34a18498a 100644
--- a/examples/demos/maroon/content/towers/Factory.qml
+++ b/examples/quick/demos/maroon/content/towers/Factory.qml
diff --git a/examples/demos/maroon/content/towers/Melee.qml b/examples/quick/demos/maroon/content/towers/Melee.qml
index 1b49a455aa..1b49a455aa 100644
--- a/examples/demos/maroon/content/towers/Melee.qml
+++ b/examples/quick/demos/maroon/content/towers/Melee.qml
diff --git a/examples/demos/maroon/content/towers/Ranged.qml b/examples/quick/demos/maroon/content/towers/Ranged.qml
index 33f3354fb6..33f3354fb6 100644
--- a/examples/demos/maroon/content/towers/Ranged.qml
+++ b/examples/quick/demos/maroon/content/towers/Ranged.qml
diff --git a/examples/demos/maroon/content/towers/TowerBase.qml b/examples/quick/demos/maroon/content/towers/TowerBase.qml
index 5c71cb051f..5c71cb051f 100644
--- a/examples/demos/maroon/content/towers/TowerBase.qml
+++ b/examples/quick/demos/maroon/content/towers/TowerBase.qml
diff --git a/examples/demos/samegame/main.cpp b/examples/quick/demos/maroon/main.cpp
index 20bf7fad18..6866cf8d7b 100644
--- a/examples/demos/samegame/main.cpp
+++ b/examples/quick/demos/maroon/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(samegame)
+DECLARATIVE_EXAMPLE_MAIN(demos/maroon/maroon)
diff --git a/examples/quick/demos/maroon/maroon.pro b/examples/quick/demos/maroon/maroon.pro
new file mode 100644
index 0000000000..6ca0a2bf16
--- /dev/null
+++ b/examples/quick/demos/maroon/maroon.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+RESOURCES += maroon.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon
+INSTALLS += target
diff --git a/examples/demos/maroon/maroon.qml b/examples/quick/demos/maroon/maroon.qml
index d7bfcb6a66..d7bfcb6a66 100644
--- a/examples/demos/maroon/maroon.qml
+++ b/examples/quick/demos/maroon/maroon.qml
diff --git a/examples/demos/maroon/maroon.qmlproject b/examples/quick/demos/maroon/maroon.qmlproject
index 752666114f..752666114f 100644
--- a/examples/demos/maroon/maroon.qmlproject
+++ b/examples/quick/demos/maroon/maroon.qmlproject
diff --git a/examples/quick/demos/maroon/maroon.qrc b/examples/quick/demos/maroon/maroon.qrc
new file mode 100644
index 0000000000..52c2a4e513
--- /dev/null
+++ b/examples/quick/demos/maroon/maroon.qrc
@@ -0,0 +1,71 @@
+<RCC>
+    <qresource prefix="/demos/maroon">
+        <file>maroon.qml</file>
+        <file>content/BuildButton.qml</file>
+        <file>content/GameCanvas.qml</file>
+        <file>content/GameOverScreen.qml</file>
+        <file>content/InfoBar.qml</file>
+        <file>content/logic.js</file>
+        <file>content/NewGameScreen.qml</file>
+        <file>content/SoundEffect.qml</file>
+        <file>content/audio/bomb-action.wav</file>
+        <file>content/audio/catch-action.wav</file>
+        <file>content/audio/catch.wav</file>
+        <file>content/audio/currency.wav</file>
+        <file>content/audio/factory-action.wav</file>
+        <file>content/audio/melee-action.wav</file>
+        <file>content/audio/projectile-action.wav</file>
+        <file>content/audio/shooter-action.wav</file>
+        <file>content/gfx/background.png</file>
+        <file>content/gfx/bomb-action.png</file>
+        <file>content/gfx/bomb-idle.png</file>
+        <file>content/gfx/bomb.png</file>
+        <file>content/gfx/button-help.png</file>
+        <file>content/gfx/button-play.png</file>
+        <file>content/gfx/catch-action.png</file>
+        <file>content/gfx/catch.png</file>
+        <file>content/gfx/cloud.png</file>
+        <file>content/gfx/currency.png</file>
+        <file>content/gfx/dialog-bomb.png</file>
+        <file>content/gfx/dialog-factory.png</file>
+        <file>content/gfx/dialog-melee.png</file>
+        <file>content/gfx/dialog-pointer.png</file>
+        <file>content/gfx/dialog-shooter.png</file>
+        <file>content/gfx/dialog.png</file>
+        <file>content/gfx/factory-action.png</file>
+        <file>content/gfx/factory-idle.png</file>
+        <file>content/gfx/factory.png</file>
+        <file>content/gfx/grid.png</file>
+        <file>content/gfx/help.png</file>
+        <file>content/gfx/lifes.png</file>
+        <file>content/gfx/logo-bubble.png</file>
+        <file>content/gfx/logo-fish.png</file>
+        <file>content/gfx/logo.png</file>
+        <file>content/gfx/melee-action.png</file>
+        <file>content/gfx/melee-idle.png</file>
+        <file>content/gfx/melee.png</file>
+        <file>content/gfx/mob-idle.png</file>
+        <file>content/gfx/mob.png</file>
+        <file>content/gfx/points.png</file>
+        <file>content/gfx/projectile-action.png</file>
+        <file>content/gfx/projectile.png</file>
+        <file>content/gfx/scores.png</file>
+        <file>content/gfx/shooter-action.png</file>
+        <file>content/gfx/shooter-idle.png</file>
+        <file>content/gfx/shooter.png</file>
+        <file>content/gfx/sunlight.png</file>
+        <file>content/gfx/text-1.png</file>
+        <file>content/gfx/text-2.png</file>
+        <file>content/gfx/text-3.png</file>
+        <file>content/gfx/text-blank.png</file>
+        <file>content/gfx/text-gameover.png</file>
+        <file>content/gfx/text-go.png</file>
+        <file>content/gfx/wave.png</file>
+        <file>content/mobs/MobBase.qml</file>
+        <file>content/towers/Bomb.qml</file>
+        <file>content/towers/Factory.qml</file>
+        <file>content/towers/Melee.qml</file>
+        <file>content/towers/Ranged.qml</file>
+        <file>content/towers/TowerBase.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 12902c0413..12902c0413 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
index fc832eaed8..fc832eaed8 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml
index 6571470e2f..6571470e2f 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml
index 8543bee157..8543bee157 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index e14a1da266..e14a1da266 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
index d2f915887f..d2f915887f 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml
index 98fcd931dd..98fcd931dd 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml
index eeb8c355e3..eeb8c355e3 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
index 431af8545d..431af8545d 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/busy.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/images/busy.png
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
index 1847ab528d..1847ab528d 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/qmldir b/examples/quick/demos/photoviewer/PhotoViewerCore/qmldir
index d3c247f21a..d3c247f21a 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/qmldir
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/qmldir
diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.js b/examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/script/script.js
+++ b/examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js
diff --git a/examples/demos/photoviewer/i18n/base.ts b/examples/quick/demos/photoviewer/i18n/base.ts
index 1accfd2f90..1accfd2f90 100644
--- a/examples/demos/photoviewer/i18n/base.ts
+++ b/examples/quick/demos/photoviewer/i18n/base.ts
diff --git a/examples/demos/photoviewer/i18n/qml_fr.qm b/examples/quick/demos/photoviewer/i18n/qml_fr.qm
index c24fcbc46c..c24fcbc46c 100644
--- a/examples/demos/photoviewer/i18n/qml_fr.qm
+++ b/examples/quick/demos/photoviewer/i18n/qml_fr.qm
diff --git a/examples/demos/photoviewer/i18n/qml_fr.ts b/examples/quick/demos/photoviewer/i18n/qml_fr.ts
index 9f892db616..9f892db616 100644
--- a/examples/demos/photoviewer/i18n/qml_fr.ts
+++ b/examples/quick/demos/photoviewer/i18n/qml_fr.ts
diff --git a/examples/demos/photoviewer/photoviewer.qml b/examples/quick/demos/photoviewer/photoviewer.qml
index caeade4594..caeade4594 100644
--- a/examples/demos/photoviewer/photoviewer.qml
+++ b/examples/quick/demos/photoviewer/photoviewer.qml
diff --git a/examples/demos/photoviewer/photoviewer.qmlproject b/examples/quick/demos/photoviewer/photoviewer.qmlproject
index 600bdb10f4..600bdb10f4 100644
--- a/examples/demos/photoviewer/photoviewer.qmlproject
+++ b/examples/quick/demos/photoviewer/photoviewer.qmlproject
diff --git a/examples/demos/rssnews/content/BusyIndicator.qml b/examples/quick/demos/rssnews/content/BusyIndicator.qml
index 20ac08f612..20ac08f612 100644
--- a/examples/demos/rssnews/content/BusyIndicator.qml
+++ b/examples/quick/demos/rssnews/content/BusyIndicator.qml
diff --git a/examples/demos/rssnews/content/CategoryDelegate.qml b/examples/quick/demos/rssnews/content/CategoryDelegate.qml
index a6fea432f8..a6fea432f8 100644
--- a/examples/demos/rssnews/content/CategoryDelegate.qml
+++ b/examples/quick/demos/rssnews/content/CategoryDelegate.qml
diff --git a/examples/demos/rssnews/content/NewsDelegate.qml b/examples/quick/demos/rssnews/content/NewsDelegate.qml
index fe481a0eb0..fe481a0eb0 100644
--- a/examples/demos/rssnews/content/NewsDelegate.qml
+++ b/examples/quick/demos/rssnews/content/NewsDelegate.qml
diff --git a/examples/demos/rssnews/content/RssFeeds.qml b/examples/quick/demos/rssnews/content/RssFeeds.qml
index 9a31d2be3e..9a31d2be3e 100644
--- a/examples/demos/rssnews/content/RssFeeds.qml
+++ b/examples/quick/demos/rssnews/content/RssFeeds.qml
diff --git a/examples/demos/rssnews/content/ScrollBar.qml b/examples/quick/demos/rssnews/content/ScrollBar.qml
index 2752b7c56d..2752b7c56d 100644
--- a/examples/demos/rssnews/content/ScrollBar.qml
+++ b/examples/quick/demos/rssnews/content/ScrollBar.qml
diff --git a/examples/demos/rssnews/content/images/busy.png b/examples/quick/demos/rssnews/content/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/demos/rssnews/content/images/busy.png
+++ b/examples/quick/demos/rssnews/content/images/busy.png
diff --git a/examples/demos/rssnews/content/images/scrollbar.png b/examples/quick/demos/rssnews/content/images/scrollbar.png
index 0228dcf9eb..0228dcf9eb 100644
--- a/examples/demos/rssnews/content/images/scrollbar.png
+++ b/examples/quick/demos/rssnews/content/images/scrollbar.png
diff --git a/examples/demos/rssnews/rssnews.qml b/examples/quick/demos/rssnews/rssnews.qml
index 72c7170c93..72c7170c93 100644
--- a/examples/demos/rssnews/rssnews.qml
+++ b/examples/quick/demos/rssnews/rssnews.qml
diff --git a/examples/demos/rssnews/rssnews.qmlproject b/examples/quick/demos/rssnews/rssnews.qmlproject
index 5becbdaed0..5becbdaed0 100644
--- a/examples/demos/rssnews/rssnews.qmlproject
+++ b/examples/quick/demos/rssnews/rssnews.qmlproject
diff --git a/examples/demos/samegame/content/Block.qml b/examples/quick/demos/samegame/content/Block.qml
index 85f2e27d2a..85f2e27d2a 100644
--- a/examples/demos/samegame/content/Block.qml
+++ b/examples/quick/demos/samegame/content/Block.qml
diff --git a/examples/demos/samegame/content/BlockEmitter.qml b/examples/quick/demos/samegame/content/BlockEmitter.qml
index 7dad509dfd..7dad509dfd 100644
--- a/examples/demos/samegame/content/BlockEmitter.qml
+++ b/examples/quick/demos/samegame/content/BlockEmitter.qml
diff --git a/examples/demos/samegame/content/Button.qml b/examples/quick/demos/samegame/content/Button.qml
index aab21ec8c6..aab21ec8c6 100644
--- a/examples/demos/samegame/content/Button.qml
+++ b/examples/quick/demos/samegame/content/Button.qml
diff --git a/examples/demos/samegame/content/GameArea.qml b/examples/quick/demos/samegame/content/GameArea.qml
index f3ca98d80e..f3ca98d80e 100644
--- a/examples/demos/samegame/content/GameArea.qml
+++ b/examples/quick/demos/samegame/content/GameArea.qml
diff --git a/examples/demos/samegame/content/LogoAnimation.qml b/examples/quick/demos/samegame/content/LogoAnimation.qml
index c879893e92..c879893e92 100644
--- a/examples/demos/samegame/content/LogoAnimation.qml
+++ b/examples/quick/demos/samegame/content/LogoAnimation.qml
diff --git a/examples/demos/samegame/content/MenuEmitter.qml b/examples/quick/demos/samegame/content/MenuEmitter.qml
index 16c766068c..16c766068c 100644
--- a/examples/demos/samegame/content/MenuEmitter.qml
+++ b/examples/quick/demos/samegame/content/MenuEmitter.qml
diff --git a/examples/demos/samegame/content/PaintEmitter.qml b/examples/quick/demos/samegame/content/PaintEmitter.qml
index 4a67c4a2d2..4a67c4a2d2 100644
--- a/examples/demos/samegame/content/PaintEmitter.qml
+++ b/examples/quick/demos/samegame/content/PaintEmitter.qml
diff --git a/examples/demos/samegame/content/PrimaryPack.qml b/examples/quick/demos/samegame/content/PrimaryPack.qml
index 278ed0eae1..278ed0eae1 100644
--- a/examples/demos/samegame/content/PrimaryPack.qml
+++ b/examples/quick/demos/samegame/content/PrimaryPack.qml
diff --git a/examples/demos/samegame/content/PuzzleBlock.qml b/examples/quick/demos/samegame/content/PuzzleBlock.qml
index 8a0e725b16..8a0e725b16 100644
--- a/examples/demos/samegame/content/PuzzleBlock.qml
+++ b/examples/quick/demos/samegame/content/PuzzleBlock.qml
diff --git a/examples/demos/samegame/content/SamegameText.qml b/examples/quick/demos/samegame/content/SamegameText.qml
index 28c85f9486..28c85f9486 100644
--- a/examples/demos/samegame/content/SamegameText.qml
+++ b/examples/quick/demos/samegame/content/SamegameText.qml
diff --git a/examples/demos/samegame/content/SimpleBlock.qml b/examples/quick/demos/samegame/content/SimpleBlock.qml
index 22a1fa3225..22a1fa3225 100644
--- a/examples/demos/samegame/content/SimpleBlock.qml
+++ b/examples/quick/demos/samegame/content/SimpleBlock.qml
diff --git a/examples/demos/samegame/content/SmokeText.qml b/examples/quick/demos/samegame/content/SmokeText.qml
index 73d9ae42da..73d9ae42da 100644
--- a/examples/demos/samegame/content/SmokeText.qml
+++ b/examples/quick/demos/samegame/content/SmokeText.qml
diff --git a/examples/demos/samegame/content/gfx/background-puzzle.png b/examples/quick/demos/samegame/content/gfx/background-puzzle.png
index c2eca5f5dc..c2eca5f5dc 100644
--- a/examples/demos/samegame/content/gfx/background-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/background-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/background.png b/examples/quick/demos/samegame/content/gfx/background.png
index 60f57b650f..60f57b650f 100644
--- a/examples/demos/samegame/content/gfx/background.png
+++ b/examples/quick/demos/samegame/content/gfx/background.png
diff --git a/examples/demos/samegame/content/gfx/bar.png b/examples/quick/demos/samegame/content/gfx/bar.png
index 4953cd6221..4953cd6221 100644
--- a/examples/demos/samegame/content/gfx/bar.png
+++ b/examples/quick/demos/samegame/content/gfx/bar.png
diff --git a/examples/demos/samegame/content/gfx/blue-puzzle.png b/examples/quick/demos/samegame/content/gfx/blue-puzzle.png
index e550d5935b..e550d5935b 100644
--- a/examples/demos/samegame/content/gfx/blue-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/blue-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/blue.png b/examples/quick/demos/samegame/content/gfx/blue.png
index b8161c0f70..b8161c0f70 100644
--- a/examples/demos/samegame/content/gfx/blue.png
+++ b/examples/quick/demos/samegame/content/gfx/blue.png
diff --git a/examples/demos/samegame/content/gfx/bubble-highscore.png b/examples/quick/demos/samegame/content/gfx/bubble-highscore.png
index c4e38df824..c4e38df824 100644
--- a/examples/demos/samegame/content/gfx/bubble-highscore.png
+++ b/examples/quick/demos/samegame/content/gfx/bubble-highscore.png
diff --git a/examples/demos/samegame/content/gfx/bubble-puzzle.png b/examples/quick/demos/samegame/content/gfx/bubble-puzzle.png
index 278556bc8d..278556bc8d 100644
--- a/examples/demos/samegame/content/gfx/bubble-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/bubble-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/but-game-1.png b/examples/quick/demos/samegame/content/gfx/but-game-1.png
index 3343b7ff13..3343b7ff13 100644
--- a/examples/demos/samegame/content/gfx/but-game-1.png
+++ b/examples/quick/demos/samegame/content/gfx/but-game-1.png
diff --git a/examples/demos/samegame/content/gfx/but-game-2.png b/examples/quick/demos/samegame/content/gfx/but-game-2.png
index afba106962..afba106962 100644
--- a/examples/demos/samegame/content/gfx/but-game-2.png
+++ b/examples/quick/demos/samegame/content/gfx/but-game-2.png
diff --git a/examples/demos/samegame/content/gfx/but-game-3.png b/examples/quick/demos/samegame/content/gfx/but-game-3.png
index adea77a687..adea77a687 100644
--- a/examples/demos/samegame/content/gfx/but-game-3.png
+++ b/examples/quick/demos/samegame/content/gfx/but-game-3.png
diff --git a/examples/demos/samegame/content/gfx/but-game-4.png b/examples/quick/demos/samegame/content/gfx/but-game-4.png
index 18c922ba45..18c922ba45 100644
--- a/examples/demos/samegame/content/gfx/but-game-4.png
+++ b/examples/quick/demos/samegame/content/gfx/but-game-4.png
diff --git a/examples/demos/samegame/content/gfx/but-game-new.png b/examples/quick/demos/samegame/content/gfx/but-game-new.png
index 257e182585..257e182585 100644
--- a/examples/demos/samegame/content/gfx/but-game-new.png
+++ b/examples/quick/demos/samegame/content/gfx/but-game-new.png
diff --git a/examples/demos/samegame/content/gfx/but-menu.png b/examples/quick/demos/samegame/content/gfx/but-menu.png
index 8440e87759..8440e87759 100644
--- a/examples/demos/samegame/content/gfx/but-menu.png
+++ b/examples/quick/demos/samegame/content/gfx/but-menu.png
diff --git a/examples/demos/samegame/content/gfx/but-puzzle-next.png b/examples/quick/demos/samegame/content/gfx/but-puzzle-next.png
index 7e3ed417d0..7e3ed417d0 100644
--- a/examples/demos/samegame/content/gfx/but-puzzle-next.png
+++ b/examples/quick/demos/samegame/content/gfx/but-puzzle-next.png
diff --git a/examples/demos/samegame/content/gfx/but-quit.png b/examples/quick/demos/samegame/content/gfx/but-quit.png
index 95c77ced94..95c77ced94 100644
--- a/examples/demos/samegame/content/gfx/but-quit.png
+++ b/examples/quick/demos/samegame/content/gfx/but-quit.png
diff --git a/examples/demos/samegame/content/gfx/green-puzzle.png b/examples/quick/demos/samegame/content/gfx/green-puzzle.png
index 581f76fd8d..581f76fd8d 100644
--- a/examples/demos/samegame/content/gfx/green-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/green-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/green.png b/examples/quick/demos/samegame/content/gfx/green.png
index da4cca5e7f..da4cca5e7f 100644
--- a/examples/demos/samegame/content/gfx/green.png
+++ b/examples/quick/demos/samegame/content/gfx/green.png
diff --git a/examples/demos/samegame/content/gfx/icon-fail.png b/examples/quick/demos/samegame/content/gfx/icon-fail.png
index 40726118a9..40726118a9 100644
--- a/examples/demos/samegame/content/gfx/icon-fail.png
+++ b/examples/quick/demos/samegame/content/gfx/icon-fail.png
diff --git a/examples/demos/samegame/content/gfx/icon-ok.png b/examples/quick/demos/samegame/content/gfx/icon-ok.png
index 15a8442e94..15a8442e94 100644
--- a/examples/demos/samegame/content/gfx/icon-ok.png
+++ b/examples/quick/demos/samegame/content/gfx/icon-ok.png
diff --git a/examples/demos/samegame/content/gfx/icon-time.png b/examples/quick/demos/samegame/content/gfx/icon-time.png
index 9490e49e90..9490e49e90 100644
--- a/examples/demos/samegame/content/gfx/icon-time.png
+++ b/examples/quick/demos/samegame/content/gfx/icon-time.png
diff --git a/examples/demos/samegame/content/gfx/logo-a.png b/examples/quick/demos/samegame/content/gfx/logo-a.png
index 20c20ba480..20c20ba480 100644
--- a/examples/demos/samegame/content/gfx/logo-a.png
+++ b/examples/quick/demos/samegame/content/gfx/logo-a.png
diff --git a/examples/demos/samegame/content/gfx/logo-e.png b/examples/quick/demos/samegame/content/gfx/logo-e.png
index dd663f114a..dd663f114a 100644
--- a/examples/demos/samegame/content/gfx/logo-e.png
+++ b/examples/quick/demos/samegame/content/gfx/logo-e.png
diff --git a/examples/demos/samegame/content/gfx/logo-g.png b/examples/quick/demos/samegame/content/gfx/logo-g.png
index a319bf9ffa..a319bf9ffa 100644
--- a/examples/demos/samegame/content/gfx/logo-g.png
+++ b/examples/quick/demos/samegame/content/gfx/logo-g.png
diff --git a/examples/demos/samegame/content/gfx/logo-m.png b/examples/quick/demos/samegame/content/gfx/logo-m.png
index 6a029b3267..6a029b3267 100644
--- a/examples/demos/samegame/content/gfx/logo-m.png
+++ b/examples/quick/demos/samegame/content/gfx/logo-m.png
diff --git a/examples/demos/samegame/content/gfx/logo-s.png b/examples/quick/demos/samegame/content/gfx/logo-s.png
index 963b17546a..963b17546a 100644
--- a/examples/demos/samegame/content/gfx/logo-s.png
+++ b/examples/quick/demos/samegame/content/gfx/logo-s.png
diff --git a/examples/demos/samegame/content/gfx/logo.png b/examples/quick/demos/samegame/content/gfx/logo.png
index e900eddb2f..e900eddb2f 100644
--- a/examples/demos/samegame/content/gfx/logo.png
+++ b/examples/quick/demos/samegame/content/gfx/logo.png
diff --git a/examples/demos/samegame/content/gfx/particle-brick.png b/examples/quick/demos/samegame/content/gfx/particle-brick.png
index 5c83896d22..5c83896d22 100644
--- a/examples/demos/samegame/content/gfx/particle-brick.png
+++ b/examples/quick/demos/samegame/content/gfx/particle-brick.png
diff --git a/examples/demos/samegame/content/gfx/particle-paint.png b/examples/quick/demos/samegame/content/gfx/particle-paint.png
index 9bd0a2a13f..9bd0a2a13f 100644
--- a/examples/demos/samegame/content/gfx/particle-paint.png
+++ b/examples/quick/demos/samegame/content/gfx/particle-paint.png
diff --git a/examples/demos/samegame/content/gfx/particle-smoke.png b/examples/quick/demos/samegame/content/gfx/particle-smoke.png
index b27f954a79..b27f954a79 100644
--- a/examples/demos/samegame/content/gfx/particle-smoke.png
+++ b/examples/quick/demos/samegame/content/gfx/particle-smoke.png
diff --git a/examples/demos/samegame/content/gfx/red-puzzle.png b/examples/quick/demos/samegame/content/gfx/red-puzzle.png
index 9ceb17e4d0..9ceb17e4d0 100644
--- a/examples/demos/samegame/content/gfx/red-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/red-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/red.png b/examples/quick/demos/samegame/content/gfx/red.png
index 681810fe3b..681810fe3b 100644
--- a/examples/demos/samegame/content/gfx/red.png
+++ b/examples/quick/demos/samegame/content/gfx/red.png
diff --git a/examples/demos/samegame/content/gfx/text-highscore-new.png b/examples/quick/demos/samegame/content/gfx/text-highscore-new.png
index 50f7fcd0f6..50f7fcd0f6 100644
--- a/examples/demos/samegame/content/gfx/text-highscore-new.png
+++ b/examples/quick/demos/samegame/content/gfx/text-highscore-new.png
diff --git a/examples/demos/samegame/content/gfx/text-highscore.png b/examples/quick/demos/samegame/content/gfx/text-highscore.png
index 7198c277b8..7198c277b8 100644
--- a/examples/demos/samegame/content/gfx/text-highscore.png
+++ b/examples/quick/demos/samegame/content/gfx/text-highscore.png
diff --git a/examples/demos/samegame/content/gfx/text-no-winner.png b/examples/quick/demos/samegame/content/gfx/text-no-winner.png
index b4a6685111..b4a6685111 100644
--- a/examples/demos/samegame/content/gfx/text-no-winner.png
+++ b/examples/quick/demos/samegame/content/gfx/text-no-winner.png
diff --git a/examples/demos/samegame/content/gfx/text-p1-go.png b/examples/quick/demos/samegame/content/gfx/text-p1-go.png
index c7bd2a5e75..c7bd2a5e75 100644
--- a/examples/demos/samegame/content/gfx/text-p1-go.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p1-go.png
diff --git a/examples/demos/samegame/content/gfx/text-p1-won.png b/examples/quick/demos/samegame/content/gfx/text-p1-won.png
index 41c2eb7c98..41c2eb7c98 100644
--- a/examples/demos/samegame/content/gfx/text-p1-won.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p1-won.png
diff --git a/examples/demos/samegame/content/gfx/text-p1.png b/examples/quick/demos/samegame/content/gfx/text-p1.png
index b59c87b977..b59c87b977 100644
--- a/examples/demos/samegame/content/gfx/text-p1.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p1.png
diff --git a/examples/demos/samegame/content/gfx/text-p2-go.png b/examples/quick/demos/samegame/content/gfx/text-p2-go.png
index f03cd93afa..f03cd93afa 100644
--- a/examples/demos/samegame/content/gfx/text-p2-go.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p2-go.png
diff --git a/examples/demos/samegame/content/gfx/text-p2-won.png b/examples/quick/demos/samegame/content/gfx/text-p2-won.png
index 116b7f2e7a..116b7f2e7a 100644
--- a/examples/demos/samegame/content/gfx/text-p2-won.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p2-won.png
diff --git a/examples/demos/samegame/content/gfx/text-p2.png b/examples/quick/demos/samegame/content/gfx/text-p2.png
index d4f2bc7335..d4f2bc7335 100644
--- a/examples/demos/samegame/content/gfx/text-p2.png
+++ b/examples/quick/demos/samegame/content/gfx/text-p2.png
diff --git a/examples/demos/samegame/content/gfx/yellow-puzzle.png b/examples/quick/demos/samegame/content/gfx/yellow-puzzle.png
index 66044c81b4..66044c81b4 100644
--- a/examples/demos/samegame/content/gfx/yellow-puzzle.png
+++ b/examples/quick/demos/samegame/content/gfx/yellow-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/yellow.png b/examples/quick/demos/samegame/content/gfx/yellow.png
index 6bc5d385e3..6bc5d385e3 100644
--- a/examples/demos/samegame/content/gfx/yellow.png
+++ b/examples/quick/demos/samegame/content/gfx/yellow.png
diff --git a/examples/demos/samegame/content/levels/TemplateBase.qml b/examples/quick/demos/samegame/content/levels/TemplateBase.qml
index f0832d447f..f0832d447f 100644
--- a/examples/demos/samegame/content/levels/TemplateBase.qml
+++ b/examples/quick/demos/samegame/content/levels/TemplateBase.qml
diff --git a/examples/demos/samegame/content/levels/level0.qml b/examples/quick/demos/samegame/content/levels/level0.qml
index 5d2fa4faf5..5d2fa4faf5 100644
--- a/examples/demos/samegame/content/levels/level0.qml
+++ b/examples/quick/demos/samegame/content/levels/level0.qml
diff --git a/examples/demos/samegame/content/levels/level1.qml b/examples/quick/demos/samegame/content/levels/level1.qml
index 4bb15cbe6a..4bb15cbe6a 100644
--- a/examples/demos/samegame/content/levels/level1.qml
+++ b/examples/quick/demos/samegame/content/levels/level1.qml
diff --git a/examples/demos/samegame/content/levels/level2.qml b/examples/quick/demos/samegame/content/levels/level2.qml
index a319479a60..a319479a60 100644
--- a/examples/demos/samegame/content/levels/level2.qml
+++ b/examples/quick/demos/samegame/content/levels/level2.qml
diff --git a/examples/demos/samegame/content/levels/level3.qml b/examples/quick/demos/samegame/content/levels/level3.qml
index 43e82d7694..43e82d7694 100644
--- a/examples/demos/samegame/content/levels/level3.qml
+++ b/examples/quick/demos/samegame/content/levels/level3.qml
diff --git a/examples/demos/samegame/content/levels/level4.qml b/examples/quick/demos/samegame/content/levels/level4.qml
index 46ad42f709..46ad42f709 100644
--- a/examples/demos/samegame/content/levels/level4.qml
+++ b/examples/quick/demos/samegame/content/levels/level4.qml
diff --git a/examples/demos/samegame/content/levels/level5.qml b/examples/quick/demos/samegame/content/levels/level5.qml
index 3716264993..3716264993 100644
--- a/examples/demos/samegame/content/levels/level5.qml
+++ b/examples/quick/demos/samegame/content/levels/level5.qml
diff --git a/examples/demos/samegame/content/levels/level6.qml b/examples/quick/demos/samegame/content/levels/level6.qml
index 4547b75a37..4547b75a37 100644
--- a/examples/demos/samegame/content/levels/level6.qml
+++ b/examples/quick/demos/samegame/content/levels/level6.qml
diff --git a/examples/demos/samegame/content/levels/level7.qml b/examples/quick/demos/samegame/content/levels/level7.qml
index 5d71d7cb51..5d71d7cb51 100644
--- a/examples/demos/samegame/content/levels/level7.qml
+++ b/examples/quick/demos/samegame/content/levels/level7.qml
diff --git a/examples/demos/samegame/content/levels/level8.qml b/examples/quick/demos/samegame/content/levels/level8.qml
index 9dbb8c2d5f..9dbb8c2d5f 100644
--- a/examples/demos/samegame/content/levels/level8.qml
+++ b/examples/quick/demos/samegame/content/levels/level8.qml
diff --git a/examples/demos/samegame/content/levels/level9.qml b/examples/quick/demos/samegame/content/levels/level9.qml
index 4e8bf19e26..4e8bf19e26 100644
--- a/examples/demos/samegame/content/levels/level9.qml
+++ b/examples/quick/demos/samegame/content/levels/level9.qml
diff --git a/examples/demos/samegame/content/samegame.js b/examples/quick/demos/samegame/content/samegame.js
index 7b226cb42f..7b226cb42f 100755
--- a/examples/demos/samegame/content/samegame.js
+++ b/examples/quick/demos/samegame/content/samegame.js
diff --git a/examples/demos/maroon/main.cpp b/examples/quick/demos/samegame/main.cpp
index da2343e444..c12804ef1f 100644
--- a/examples/demos/maroon/main.cpp
+++ b/examples/quick/demos/samegame/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(maroon)
+DECLARATIVE_EXAMPLE_MAIN(demos/samegame/samegame)
diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro
new file mode 100644
index 0000000000..59cacd3c8b
--- /dev/null
+++ b/examples/quick/demos/samegame/samegame.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+RESOURCES += samegame.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame
+INSTALLS += target
diff --git a/examples/demos/samegame/samegame.qml b/examples/quick/demos/samegame/samegame.qml
index 2b0b82a37c..2b0b82a37c 100644
--- a/examples/demos/samegame/samegame.qml
+++ b/examples/quick/demos/samegame/samegame.qml
diff --git a/examples/demos/samegame/samegame.qmlproject b/examples/quick/demos/samegame/samegame.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/demos/samegame/samegame.qmlproject
+++ b/examples/quick/demos/samegame/samegame.qmlproject
diff --git a/examples/quick/demos/samegame/samegame.qrc b/examples/quick/demos/samegame/samegame.qrc
new file mode 100644
index 0000000000..951b9d116c
--- /dev/null
+++ b/examples/quick/demos/samegame/samegame.qrc
@@ -0,0 +1,72 @@
+<RCC>
+    <qresource prefix="/demos/samegame">
+        <file>samegame.qml</file>
+        <file>settings.js</file>
+        <file>content/gfx/text-p1-won.png</file>
+        <file>content/gfx/background-puzzle.png</file>
+        <file>content/gfx/background.png</file>
+        <file>content/gfx/bar.png</file>
+        <file>content/gfx/blue-puzzle.png</file>
+        <file>content/gfx/blue.png</file>
+        <file>content/gfx/bubble-highscore.png</file>
+        <file>content/gfx/bubble-puzzle.png</file>
+        <file>content/gfx/but-game-1.png</file>
+        <file>content/gfx/but-game-2.png</file>
+        <file>content/gfx/but-game-3.png</file>
+        <file>content/gfx/but-game-4.png</file>
+        <file>content/gfx/but-game-new.png</file>
+        <file>content/gfx/but-menu.png</file>
+        <file>content/gfx/but-puzzle-next.png</file>
+        <file>content/gfx/but-quit.png</file>
+        <file>content/gfx/green-puzzle.png</file>
+        <file>content/gfx/green.png</file>
+        <file>content/gfx/icon-fail.png</file>
+        <file>content/gfx/icon-ok.png</file>
+        <file>content/gfx/icon-time.png</file>
+        <file>content/gfx/logo-a.png</file>
+        <file>content/gfx/logo-e.png</file>
+        <file>content/gfx/logo-g.png</file>
+        <file>content/gfx/logo-m.png</file>
+        <file>content/gfx/logo-s.png</file>
+        <file>content/gfx/logo.png</file>
+        <file>content/gfx/particle-brick.png</file>
+        <file>content/gfx/particle-paint.png</file>
+        <file>content/gfx/particle-smoke.png</file>
+        <file>content/gfx/red-puzzle.png</file>
+        <file>content/gfx/red.png</file>
+        <file>content/gfx/text-highscore-new.png</file>
+        <file>content/gfx/text-highscore.png</file>
+        <file>content/gfx/text-no-winner.png</file>
+        <file>content/gfx/text-p1-go.png</file>
+        <file>content/gfx/text-p1.png</file>
+        <file>content/gfx/text-p2-go.png</file>
+        <file>content/gfx/text-p2-won.png</file>
+        <file>content/gfx/text-p2.png</file>
+        <file>content/gfx/yellow-puzzle.png</file>
+        <file>content/gfx/yellow.png</file>
+        <file>content/levels/level0.qml</file>
+        <file>content/levels/level1.qml</file>
+        <file>content/levels/level2.qml</file>
+        <file>content/levels/level3.qml</file>
+        <file>content/levels/level4.qml</file>
+        <file>content/levels/level5.qml</file>
+        <file>content/levels/level6.qml</file>
+        <file>content/levels/level7.qml</file>
+        <file>content/levels/level8.qml</file>
+        <file>content/levels/level9.qml</file>
+        <file>content/levels/TemplateBase.qml</file>
+        <file>content/SamegameText.qml</file>
+        <file>content/SimpleBlock.qml</file>
+        <file>content/Block.qml</file>
+        <file>content/BlockEmitter.qml</file>
+        <file>content/Button.qml</file>
+        <file>content/GameArea.qml</file>
+        <file>content/LogoAnimation.qml</file>
+        <file>content/MenuEmitter.qml</file>
+        <file>content/PaintEmitter.qml</file>
+        <file>content/PrimaryPack.qml</file>
+        <file>content/PuzzleBlock.qml</file>
+        <file>content/samegame.js</file>
+        <file>content/SmokeText.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/demos/samegame/settings.js b/examples/quick/demos/samegame/settings.js
index e09dee9af3..e09dee9af3 100644
--- a/examples/demos/samegame/settings.js
+++ b/examples/quick/demos/samegame/settings.js
diff --git a/examples/quick/demos/stocqt/content/Button.qml b/examples/quick/demos/stocqt/content/Button.qml
new file mode 100644
index 0000000000..436adf3116
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/Button.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: button
+    signal clicked
+    property alias text: txt.text
+    property bool buttonEnabled: false
+    width: Math.max(64, txt.width + 16)
+    height: 32
+    color: buttonEnabled ? "#76644A" : "transparent"
+    border.color: "#76644A"
+    border.width: 1
+    MouseArea {
+        anchors.fill: parent
+        onClicked: button.clicked()
+    }
+    Text {
+        anchors.centerIn: parent
+        font.pixelSize: 18
+        color: "#ecc089"
+        id: txt
+    }
+}
diff --git a/examples/quick/demos/stocqt/content/CheckBox.qml b/examples/quick/demos/stocqt/content/CheckBox.qml
new file mode 100644
index 0000000000..9c429d65dc
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/CheckBox.qml
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Research In Motion.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Row {
+    id: button
+    property alias text: txt.text
+    property bool buttonEnabled: true
+    width: 140
+    height: 25
+    spacing: 5
+    x: 5
+    MouseArea {
+        id: mouse
+        anchors.fill: parent
+        onClicked: {
+            if (buttonEnabled)
+                buttonEnabled = false;
+            else
+                buttonEnabled = true;
+        }
+    }
+    Rectangle {
+        id: checkbox
+        width: 23
+        height: 23
+        anchors.left: parent.left
+        border.color: "#76644A"
+        border.width: 1
+        antialiasing: true
+        radius: 2
+        color: "transparent"
+        Rectangle {
+            anchors.fill: parent
+            anchors.margins: 4
+            antialiasing: true
+            radius: 1
+            color: mouse.pressed || buttonEnabled ? "#76644A" : "transparent"
+        }
+        Text {
+            id: txt
+            anchors.left: checkbox.right
+            anchors.leftMargin: 4
+            anchors.verticalCenter: parent.verticalCenter
+            text: "Close "
+            color: "#ecc089"
+            font.pixelSize: 18
+        }
+    }
+}
diff --git a/examples/quick/demos/stocqt/content/DatePicker.qml b/examples/quick/demos/stocqt/content/DatePicker.qml
new file mode 100644
index 0000000000..490132fdbc
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/DatePicker.qml
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: root
+    color: "transparent"
+    width: 300
+    height: 40
+    property var _monthNames: [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN","JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ];
+    property var date: new Date()
+
+    onDateChanged: {
+        month.text = root._monthNames[root.date.getMonth()];
+        day.text = date.getDate();
+        year.text = date.getFullYear();
+    }
+    Row {
+        spacing: 4
+        anchors.fill: parent
+
+        Rectangle {
+            height: root.height
+            width: root.width/3 - 20
+            color: "#272822"
+            border.color: "#76644A"
+            border.width: 1
+            radius: 2
+            antialiasing: true
+
+            TextInput {
+                id: month
+                anchors.centerIn: parent
+                color: "#ecc089"
+                font.pointSize: 25
+                font.bold: true
+                text: root._monthNames[root.date.getMonth()]
+                onAccepted: {
+                    for (var i = 0; i < 12; i++) {
+                        if (text === root._monthNames[i]) {
+                            root.date.setMonth(i);
+                            root.date = root.date;
+                            return;
+                        }
+                    }
+                    root.date = root.date;
+                }
+            }
+        }
+
+        Rectangle {
+            height: root.height
+            width: root.width/3 - 20
+            color: "#272822"
+            border.color: "#76644A"
+            border.width: 1
+            radius: 2
+            antialiasing: true
+
+            TextInput {
+                id: day
+                anchors.centerIn: parent
+                color: "#ecc089"
+                font.pointSize: 25
+                font.bold: true
+                text: root.date.getDate()
+                validator:IntValidator {bottom: 1; top: 31}
+                onAccepted: { root.date.setDate(text); root.date = root.date;}
+            }
+        }
+
+        Rectangle {
+            height: root.height
+            width: root.width/3 - 20
+            color: "#272822"
+            border.color: "#76644A"
+            border.width: 1
+            radius: 2
+            antialiasing: true
+
+            TextInput {
+                id: year
+                anchors.centerIn: parent
+                color: "#ecc089"
+                font.pointSize: 25
+                font.bold: true
+                text: root.date.getFullYear()
+                validator: IntValidator {bottom: 1995; top: (new Date()).getFullYear()}
+                onAccepted:{ root.date.setFullYear(text); root.date = root.date;}
+            }
+        }
+    }
+}
diff --git a/examples/quick/demos/stocqt/content/StockChart.qml b/examples/quick/demos/stocqt/content/StockChart.qml
new file mode 100644
index 0000000000..ea2d54db9c
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/StockChart.qml
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: chart
+    width: 320
+    height: 320
+    color: "transparent"
+
+    property var _months: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]
+    property var stockModel: null
+    property var startDate
+    property var endDate
+    property var settings
+
+    function update() {
+        if (settings.chartType === "year")
+            chart.startDate = new Date(chart.endDate.getFullYear() - 1, chart.endDate.getMonth(), chart.endDate.getDate());
+        else if (settings.chartType === "month")
+            chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth() -1, chart.endDate.getDate());
+        else if (settings.chartType === "week")
+            chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth(), chart.endDate.getDate() - 7);
+        else
+            chart.startDate = new Date(1995, 3, 25);
+
+        canvas.requestPaint();
+    }
+
+    Text {
+        id: fromDate
+        color: "#6a5b44"
+        width: 50
+        font.pointSize: 10
+        wrapMode: Text.WordWrap
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: parent.top
+        text: _months[startDate.getMonth()] + "\n" + startDate.getFullYear()
+    }
+
+    Text {
+        id: toDate
+        color: "#6a5b44"
+        font.pointSize: 10
+        width: 50
+        wrapMode: Text.WordWrap
+        anchors.right: parent.right
+        anchors.leftMargin: 20
+        anchors.top: parent.top
+        text: _months[endDate.getMonth()] + "\n" + endDate.getFullYear()
+    }
+
+    Canvas {
+        id: canvas
+        width: parent.width
+        anchors.top: toDate.bottom
+        anchors.bottom: parent.bottom
+        renderTarget: Canvas.FramebufferObject
+        antialiasing: true
+        property int frames: first
+        property int mouseX: 0
+        property int mouseY: 0
+        property int mousePressedX: 0
+        property int mousePressedY: 0
+        property int movedY: 0
+        property real scaleX: 1.0
+        property real scaleY: 1.0
+        property int first: 0
+        property int last: 0
+
+        property int pixelSkip: 1
+
+        function drawBackground(ctx) {
+            ctx.save();
+            ctx.fillStyle = "#272822";
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+            ctx.strokeStyle = "#423a2f";
+            ctx.beginPath();
+            for (var i = 0; i < 10; i++) {
+                ctx.moveTo(0, i * (canvas.height/10.0));
+                ctx.lineTo(canvas.width, i * (canvas.height/10.0));
+            }
+
+            for (i = 0; i < 12; i++) {
+                ctx.moveTo(i * (canvas.width/12.0), 0);
+                ctx.lineTo(i * (canvas.width/12.0), canvas.height);
+            }
+            ctx.stroke();
+
+            ctx.strokeStyle = "#5c7a37";
+            ctx.beginPath();
+            ctx.moveTo(8 * (canvas.width/12.0), 0);
+            ctx.lineTo(8 * (canvas.width/12.0), canvas.height);
+            ctx.stroke();
+
+            ctx.restore();
+        }
+
+        function drawPrice(ctx, from, to, color, price, points, highest)
+        {
+            ctx.save();
+            ctx.globalAlpha = 0.7;
+            ctx.strokeStyle = color;
+            ctx.lineWidth = 1;
+            ctx.beginPath();
+
+            var w = canvas.width/points.length;
+            var end = points.length;
+            for (var i = 0; i < end; i+=pixelSkip) {
+                var x = points[i].x;
+                var y = points[i][price];
+                y = canvas.height * y/highest;
+                if (i == 0) {
+                    ctx.moveTo(x+w/2, y);
+                } else {
+                    ctx.lineTo(x+w/2, y);
+                }
+            }
+            ctx.stroke();
+            ctx.restore();
+        }
+
+        function drawKLine(ctx, from, to, points, highest)
+        {
+            ctx.save();
+            ctx.globalAlpha = 0.4;
+            ctx.lineWidth = 2;
+            var end = points.length;
+            for (var i = 0; i < end; i+=pixelSkip) {
+                var x = points[i].x;
+                var open = canvas.height * points[i].open/highest - canvas.movedY;
+                var close = canvas.height * points[i].close/highest - canvas.movedY;
+                var high = canvas.height * points[i].high/highest - canvas.movedY;
+                var low = canvas.height * points[i].low/highest - canvas.movedY;
+
+                var top, bottom;
+                if (close <= open) {
+                    ctx.fillStyle = Qt.rgba(1, 0, 0, 1);
+                    ctx.strokeStyle = Qt.rgba(1, 0, 0, 1);
+                    top = close;
+                    bottom = open;
+                } else {
+                    ctx.fillStyle = Qt.rgba(0, 1, 0, 1);
+                    ctx.strokeStyle = Qt.rgba(0, 1, 0, 1);
+                    top = open;
+                    bottom = close;
+                }
+
+                var w1, w2;
+                w1 = canvas.width/points.length;
+                w2 = w1 > 10 ? w1/2 : w1;
+
+                ctx.fillRect(x + (w1 - w2)/2, top, w2, bottom - top);
+                ctx.beginPath();
+                ctx.moveTo(x+w1/2, high);
+                ctx.lineTo(x+w1/2, low);
+                ctx.stroke();
+            }
+            ctx.restore();
+        }
+
+        function drawVolume(ctx, from, to, color, price, points, highest)
+        {
+            ctx.save();
+            ctx.fillStyle = color;
+            ctx.globalAlpha = 0.6;
+            ctx.strokeStyle = Qt.rgba(0.8, 0.8, 0.8, 1);
+            ctx.lineWidth = 1;
+
+            var end = points.length;
+            for (var i = 0; i < end; i+=pixelSkip) {
+                var x = points[i].x;
+                var y = points[i][price];
+                y = canvas.height * (1 - y/highest);
+                ctx.fillRect(x, y, canvas.width/points.length, canvas.height - y);
+            }
+            ctx.restore();
+        }
+
+        onPaint: {
+            var ctx = canvas.getContext("2d");
+
+            ctx.globalCompositeOperation = "source-over";
+            ctx.lineWidth = 1;
+
+            drawBackground(ctx);
+            if (!stockModel.ready)
+                return;
+
+            last = stockModel.indexOf(chart.endDate)
+            first = last - (chart.endDate.getTime() - chart.startDate.getTime())/86400000;
+            console.log("painting...  first:" + first + ", last:" + last);
+
+            var highestPrice = stockModel.highestPrice;
+            var highestVolume = stockModel.highestVolume;
+            console.log("highest price:" + highestPrice + ", highest volume:" + highestVolume)
+            var points = [];
+            for (var i = 0; i <= last - first; i+=pixelSkip) {
+                var price = stockModel.get(i + first);
+                points.push({
+                                x: i*canvas.width/(last-first+1),
+                                open: price.open,
+                                close: price.close,
+                                high:price.high,
+                                low:price.low,
+                                volume:price.volume
+                            });
+            }
+            if (settings.drawHighPrice)
+                drawPrice(ctx, first, last, settings.highColor,"high", points, highestPrice);
+            if (settings.drawLowPrice)
+                drawPrice(ctx, first, last, settings.lowColor,"low", points, highestPrice);
+            if (settings.drawOpenPrice)
+                drawPrice(ctx, first, last,settings.openColor,"open", points, highestPrice);
+            if (settings.drawClosePrice)
+                drawPrice(ctx, first, last, settings.closeColor,"close", points, highestPrice);
+            if (settings.drawVolume)
+                drawVolume(ctx, first, last, settings.volumeColor,"volume", points, highestVolume);
+            if (settings.drawKLine)
+                drawKLine(ctx, first, last, points, highestPrice);
+        }
+    }
+}
diff --git a/examples/quick/demos/stocqt/content/StockListModel.qml b/examples/quick/demos/stocqt/content/StockListModel.qml
new file mode 100644
index 0000000000..86a28f3769
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/StockListModel.qml
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+ListModel {
+    id: stocks
+    // Data from : http://en.wikipedia.org/wiki/NASDAQ-100
+    ListElement {name: "Activision Blizzard"; stockId: "ATVI"}
+    ListElement {name: "Adobe Systems Incorporated"; stockId: "ADBE"}
+    ListElement {name: "Akamai Technologies, Inc"; stockId: "AKAM"}
+    ListElement {name: "Alexion Pharmaceuticals"; stockId: "ALXN"}
+    ListElement {name: "Altera Corporation"; stockId: "ALTR"}
+    ListElement {name: "Amazon.com, Inc."; stockId: "AMZN"}
+    ListElement {name: "Amgen Inc."; stockId: "AMGN"}
+    ListElement {name: "Apollo Group, Inc."; stockId: "APOL"}
+    ListElement {name: "Apple Inc."; stockId: "AAPL"}
+    ListElement {name: "Applied Materials, Inc."; stockId: "AMAT"}
+    ListElement {name: "Autodesk, Inc."; stockId: "ADSK"}
+    ListElement {name: "Automatic Data Processing, Inc."; stockId: "ADP"}
+    ListElement {name: "Baidu.com, Inc."; stockId: "BIDU"}
+    ListElement {name: "Bed Bath & Beyond Inc."; stockId: "BBBY"}
+    ListElement {name: "Biogen Idec, Inc"; stockId: "BIIB"}
+    ListElement {name: "BMC Software, Inc."; stockId: "BMC"}
+    ListElement {name: "Broadcom Corporation"; stockId: "BRCM"}
+    ListElement {name: "C. H. Robinson Worldwide, Inc."; stockId: "CHRW"}
+    ListElement {name: "CA, Inc."; stockId: "CA"}
+    ListElement {name: "Celgene Corporation"; stockId: "CELG"}
+    ListElement {name: "Cephalon, Inc."; stockId: "CEPH"}
+    ListElement {name: "Cerner Corporation"; stockId: "CERN"}
+    ListElement {name: "Check Point Software Technologies Ltd."; stockId: "CHKP"}
+    ListElement {name: "Cisco Systems, Inc."; stockId: "CSCO"}
+    ListElement {name: "Citrix Systems, Inc."; stockId: "CTXS"}
+    ListElement {name: "Cognizant Technology Solutions Corporation"; stockId: "CTSH"}
+    ListElement {name: "Comcast Corporation"; stockId: "CMCSA"}
+    ListElement {name: "Costco Wholesale Corporation"; stockId: "COST"}
+    ListElement {name: "Ctrip.com International, Ltd."; stockId: "CTRP"}
+    ListElement {name: "Dell Inc."; stockId: "DELL"}
+    ListElement {name: "DENTSPLY International Inc."; stockId: "XRAY"}
+    ListElement {name: "DirecTV"; stockId: "DTV"}
+    ListElement {name: "Dollar Tree, Inc."; stockId: "DLTR"}
+    ListElement {name: "eBay Inc."; stockId: "EBAY"}
+    ListElement {name: "Electronic Arts Inc."; stockId: "ERTS"}
+    ListElement {name: "Expedia, Inc."; stockId: "EXPE"}
+    ListElement {name: "Expeditors International of Washington, Inc."; stockId: "EXPD"}
+    ListElement {name: "Express Scripts, Inc."; stockId: "ESRX"}
+    ListElement {name: "F5 Networks, Inc."; stockId: "FFIV"}
+    ListElement {name: "Fastenal Company"; stockId: "FAST"}
+    ListElement {name: "First Solar, Inc."; stockId: "FSLR"}
+    ListElement {name: "Fiserv, Inc."; stockId: "FISV"}
+    ListElement {name: "Flextronics International Ltd."; stockId: "FLEX"}
+    ListElement {name: "FLIR Systems, Inc."; stockId: "FLIR"}
+    ListElement {name: "Garmin Ltd."; stockId: "GRMN"}
+    ListElement {name: "Gilead Sciences, Inc."; stockId: "GILD"}
+    ListElement {name: "Google Inc."; stockId: "GOOG"}
+    ListElement {name: "Green Mountain Coffee Roasters, Inc."; stockId: "GMCR"}
+    ListElement {name: "Henry Schein, Inc."; stockId: "HSIC"}
+    ListElement {name: "Illumina, Inc."; stockId: "ILMN"}
+    ListElement {name: "Infosys Technologies"; stockId: "INFY"}
+    ListElement {name: "Intel Corporation"; stockId: "INTC"}
+    ListElement {name: "Intuit, Inc."; stockId: "INTU"}
+    ListElement {name: "Intuitive Surgical Inc."; stockId: "ISRG"}
+    ListElement {name: "Joy Global Inc."; stockId: "JOYG"}
+    ListElement {name: "KLA Tencor Corporation"; stockId: "KLAC"}
+    ListElement {name: "Lam Research Corporation"; stockId: "LRCX"}
+    ListElement {name: "Liberty Media Corporation, Interactive Series A"; stockId: "LINTA"}
+    ListElement {name: "Life Technologies Corporation"; stockId: "LIFE"}
+    ListElement {name: "Linear Technology Corporation"; stockId: "LLTC"}
+    ListElement {name: "Marvell Technology Group, Ltd."; stockId: "MRVL"}
+    ListElement {name: "Mattel, Inc."; stockId: "MAT"}
+    ListElement {name: "Maxim Integrated Products"; stockId: "MXIM"}
+    ListElement {name: "Microchip Technology Incorporated"; stockId: "MCHP"}
+    ListElement {name: "Micron Technology, Inc."; stockId: "MU"}
+    ListElement {name: "Microsoft Corporation"; stockId: "MSFT"}
+    ListElement {name: "Mylan, Inc."; stockId: "MYL"}
+    ListElement {name: "NetApp, Inc."; stockId: "NTAP"}
+    ListElement {name: "Netflix, Inc."; stockId: "NFLX"}
+    ListElement {name: "News Corporation, Ltd."; stockId: "NWSA"}
+    ListElement {name: "NII Holdings, Inc."; stockId: "NIHD"}
+    ListElement {name: "NVIDIA Corporation"; stockId: "NVDA"}
+    ListElement {name: "O'Reilly Automotive, Inc."; stockId: "ORLY"}
+    ListElement {name: "Oracle Corporation"; stockId: "ORCL"}
+    ListElement {name: "PACCAR Inc."; stockId: "PCAR"}
+    ListElement {name: "Paychex, Inc."; stockId: "PAYX"}
+    ListElement {name: "Priceline.com, Incorporated"; stockId: "PCLN"}
+    ListElement {name: "Qiagen N.V."; stockId: "QGEN"}
+    ListElement {name: "QUALCOMM Incorporated"; stockId: "QCOM"}
+    ListElement {name: "Research in Motion Limited"; stockId: "RIMM"}
+    ListElement {name: "Ross Stores Inc."; stockId: "ROST"}
+    ListElement {name: "SanDisk Corporation"; stockId: "SNDK"}
+    ListElement {name: "Seagate Technology Holdings"; stockId: "STX"}
+    ListElement {name: "Sears Holdings Corporation"; stockId: "SHLD"}
+    ListElement {name: "Sigma-Aldrich Corporation"; stockId: "SIAL"}
+    ListElement {name: "Staples Inc."; stockId: "SPLS"}
+    ListElement {name: "Starbucks Corporation"; stockId: "SBUX"}
+    ListElement {name: "Stericycle, Inc"; stockId: "SRCL"}
+    ListElement {name: "Symantec Corporation"; stockId: "SYMC"}
+    ListElement {name: "Teva Pharmaceutical Industries Ltd."; stockId: "TEVA"}
+    ListElement {name: "Urban Outfitters, Inc."; stockId: "URBN"}
+    ListElement {name: "VeriSign, Inc."; stockId: "VRSN"}
+    ListElement {name: "Vertex Pharmaceuticals"; stockId: "VRTX"}
+    ListElement {name: "Virgin Media, Inc."; stockId: "VMED"}
+    ListElement {name: "Vodafone Group, plc."; stockId: "VOD"}
+    ListElement {name: "Warner Chilcott, Ltd."; stockId: "WCRX"}
+    ListElement {name: "Whole Foods Market, Inc."; stockId: "WFM"}
+    ListElement {name: "Wynn Resorts Ltd."; stockId: "WYNN"}
+    ListElement {name: "Xilinx, Inc."; stockId: "XLNX"}
+    ListElement {name: "Yahoo! Inc."; stockId: "YHOO"}
+}
diff --git a/examples/quick/demos/stocqt/content/StockListView.qml b/examples/quick/demos/stocqt/content/StockListView.qml
new file mode 100644
index 0000000000..2a2df10d56
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/StockListView.qml
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: root
+    width: 320
+    height: 480
+    color: "#423A2F"
+
+    property string currentStockId: ""
+    property string currentStockName: ""
+
+    ListView {
+        id: view
+        anchors.fill: parent
+        keyNavigationWraps: true
+        focus: true
+        snapMode: ListView.SnapToItem
+        model: StockListModel{}
+
+        onCurrentIndexChanged: {
+            root.currentStockId = model.get(currentIndex).stockId;
+            root.currentStockName = model.get(currentIndex).name;
+            console.log("current stock:" + root.currentStockId + " - " + root.currentStockName);
+        }
+
+        delegate: Rectangle {
+            height: 30
+            width: parent.width
+            color: "transparent"
+            MouseArea {
+                anchors.fill: parent;
+                onClicked:view.currentIndex = index;
+            }
+
+            Text {
+                anchors.verticalCenter: parent.top
+                anchors.verticalCenterOffset : 15
+                color: index == view.currentIndex ? "#ECC089" : "#A58963"
+                font.pointSize: 12
+                font.bold: true
+                text:"         " + stockId + " - " + name
+            }
+        }
+
+        highlight: Rectangle {
+            width: parent.width
+            color: "#662"
+        }
+    }
+}
diff --git a/examples/demos/stocqt/content/StockModel.qml b/examples/quick/demos/stocqt/content/StockModel.qml
index b5a78548e4..e9d675743d 100644
--- a/examples/demos/stocqt/content/StockModel.qml
+++ b/examples/quick/demos/stocqt/content/StockModel.qml
@@ -41,23 +41,23 @@
 import QtQuick 2.0
 
 ListModel {
-    id:model
-    property string stockId:""
-    property string stockName:""
+    id: model
+    property string stockId: ""
+    property string stockName: ""
     property var startDate
     property var endDate
-    property string stockDataCycle:"d"
-    property bool ready:false
-    property real stockPrice:0.0
-    property real stockPriceChanged:0.0
-    property real highestPrice:0
-    property real highestVolume:0
+    property string stockDataCycle: "d"
+    property bool ready: false
+    property real stockPrice: 0.0
+    property real stockPriceChanged: 0.0
+    property real highestPrice: 0
+    property real highestVolume: 0
 
     signal dataReady
 
     function indexOf(date) {
-        var end = new Date(model.get(0).date)
-        var start = new Date(model.get(model.count - 1).date)
+        var end = new Date(model.get(0).date);
+        var start = new Date(model.get(model.count - 1).date);
         if (end <= date)
             return model.count -1;
 
@@ -65,7 +65,7 @@ ListModel {
             return 0;
 
         for (var i = 0; i < model.count; i++) {
-            var d = new Date(model.get(i).date)
+            var d = new Date(model.get(i).date);
             if ( d === date)
                 return i;
         }
@@ -77,7 +77,7 @@ ListModel {
             return;
 
         if (startDate === undefined)
-            startDate = new Date(1995, 3, 25) //default: 25 April 1995
+            startDate = new Date(1995, 3, 25); //default: 25 April 1995
 
         if (endDate === undefined)
             endDate = new Date(); //today
@@ -125,18 +125,15 @@ ListModel {
        var xhr = new XMLHttpRequest;
 
         var req = requestUrl();
-        console.log("getting " + req + " .....");
 
         xhr.open("GET", req);
 
-
         model.ready = false;
         model.clear();
         var i = 1; //skip the first line
         xhr.onreadystatechange = function() {
             if (xhr.readyState === XMLHttpRequest.LOADING || xhr.readyState === XMLHttpRequest.DONE) {
                 var records = xhr.responseText.split('\n');
-                console.log("Updating:" + (records.length - i) + " records for " + model.stockId + " from:" + model.startDate + " to " + model.endDate)
 
                 for (;i < records.length; i++ ) {
                     var r = records[i].split(',');
@@ -146,10 +143,9 @@ ListModel {
 
                 if (xhr.readyState === XMLHttpRequest.DONE) {
                     if (model.count > 0) {
-                        console.log("done, total:" + model.count);
                         model.ready = true;
-                        model.stockPrice = model.get(0).adjusted
-                        model.stockPriceChanged = Math.round((model.stockPrice - model.get(2).adjusted) * 100) / 100
+                        model.stockPrice = model.get(0).adjusted;
+                        model.stockPriceChanged = Math.round((model.stockPrice - model.get(2).adjusted) * 100) / 100;
                         model.dataReady(); //emit signal
                     }
                 }
diff --git a/examples/quick/demos/stocqt/content/StockSettings.qml b/examples/quick/demos/stocqt/content/StockSettings.qml
new file mode 100644
index 0000000000..60e6bef3d0
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/StockSettings.qml
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: root
+    width: 320
+    height: 480
+    color: "#423A2F"
+    property var startDate : startDatePicker.date
+    property var endDate : endDatePicker.date
+
+    property bool drawHighPrice: highButton.buttonEnabled
+    property bool drawLowPrice: lowButton.buttonEnabled
+    property bool drawOpenPrice: openButton.buttonEnabled
+    property bool drawClosePrice: closeButton.buttonEnabled
+    property bool drawVolume: volumeButton.buttonEnabled
+    property bool drawKLine: klineButton.buttonEnabled
+
+    property color highColor: Qt.rgba(1, 0, 0, 1)
+    property color lowColor: Qt.rgba(0, 1, 0, 1)
+    property color openColor: Qt.rgba(0, 0, 1, 1)
+    property color volumeColor: Qt.rgba(0.3, 0.5, 0.7, 1)
+    property color closeColor: "#ecc088"
+
+    property string chartType: "year"
+
+    Image {
+        id: logo
+        source: "images/logo.png"
+        anchors.horizontalCenter : parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: 15
+    }
+
+    Text {
+        id: startDateText
+        text: "START DATE:"
+        color: "#76644A"
+        font.pointSize: 15
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: logo.bottom
+        anchors.topMargin: 20
+    }
+
+    DatePicker {
+        id: startDatePicker
+        anchors.left: parent.left
+        anchors.leftMargin: 30
+        anchors.top: startDateText.bottom
+        anchors.topMargin: 8
+        date: new Date(1995, 3, 25)
+    }
+
+    Text {
+        id: endDateText
+        text: "END DATE:"
+        color: "#76644A"
+        font.pointSize: 15
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: startDatePicker.bottom
+        anchors.topMargin: 20
+    }
+
+    DatePicker {
+        id: endDatePicker
+        anchors.left: parent.left
+        anchors.leftMargin: 30
+        anchors.top: endDateText.bottom
+        anchors.topMargin: 8
+    }
+
+    Text {
+        id: drawOptionsText
+        text: "DRAW OPTIONS:"
+        color: "#76644A"
+        font.pointSize: 15
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: endDatePicker.bottom
+        anchors.topMargin: 20
+    }
+    Column {
+        id: drawOptions
+        anchors.top: drawOptionsText.bottom
+        anchors.topMargin: 8
+        anchors.left: parent.left
+        anchors.leftMargin: 30
+        spacing: 2
+
+        Row {
+            spacing: 10
+
+            CheckBox {
+                id: highButton
+                text: "High"
+                buttonEnabled: false
+            }
+            CheckBox {
+                id: lowButton
+                text: "Low"
+                buttonEnabled: false
+            }
+        }
+        Row {
+            spacing: 10
+            CheckBox {
+                id: openButton
+                text: "Open"
+                buttonEnabled: false
+            }
+            CheckBox {
+                text: "Close"
+                id: closeButton
+                buttonEnabled: true
+            }
+
+        }
+        Row {
+            spacing: 10
+            CheckBox {
+                id: volumeButton
+                text: "Volume"
+                buttonEnabled: true
+            }
+            CheckBox {
+                id: klineButton
+                text: "K Line"
+                buttonEnabled: false
+            }
+        }
+    }
+
+    Text {
+        id: chartTypeText
+        text: "SHOW PREVIOUS:"
+        color: "#76644A"
+        font.pointSize: 15
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: drawOptions.bottom
+        anchors.topMargin: 20
+    }
+    Row {
+        anchors.left: parent.left
+        anchors.leftMargin: 20
+        anchors.top: chartTypeText.bottom
+        anchors.topMargin: 8
+        spacing: -1
+        Button {
+            id: yearView
+            text: "YEAR"
+            buttonEnabled: root.chartType == "year"
+            onClicked: root.chartType = "year"
+        }
+        Button {
+            id: monthView
+            text: "MONTH"
+            buttonEnabled: root.chartType == "month"
+            onClicked: root.chartType = "month"
+        }
+        Button {
+            id: weekView
+            text: "WEEK"
+            buttonEnabled: root.chartType == "week"
+            onClicked: root.chartType = "week"
+        }
+        Button {
+            id: allView
+            text: "ALL"
+            buttonEnabled: root.chartType == "all"
+            onClicked: root.chartType = "all"
+        }
+    }
+}
diff --git a/examples/quick/demos/stocqt/content/StockView.qml b/examples/quick/demos/stocqt/content/StockView.qml
new file mode 100644
index 0000000000..308ecc0535
--- /dev/null
+++ b/examples/quick/demos/stocqt/content/StockView.qml
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    id: root
+    width: 320
+    height: 480
+    color: "#423A2F"
+
+    property var stock: null
+    property var stocklist: null
+    property var settings: null
+    signal listViewClicked
+    signal settingsClicked
+
+    function update() {
+        chart.endDate = settings.endDate
+        chart.update()
+    }
+
+    Rectangle {
+        color: "#272822"
+        anchors.fill: parent
+        radius: 20
+
+        Image {
+            source: "images/icon-items.png"
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.top: parent.top
+            anchors.topMargin: 10
+            MouseArea {
+                anchors.fill: parent
+                onClicked: listViewClicked()
+            }
+        }
+        Image {
+            source: "images/icon-settings.png"
+            anchors.right: parent.right
+            anchors.rightMargin: 10
+            anchors.top: parent.top
+            anchors.topMargin: 10
+            MouseArea {
+                anchors.fill: parent
+                onClicked: settingsClicked()
+            }
+        }
+
+        Text {
+            id: desc
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.top: parent.top
+            anchors.topMargin: 40
+            color: "#564c3A"
+            font.pointSize: 15
+            text: root.stock.stockId + " - " + root.stock.stockName
+        }
+
+        Text {
+            id: price
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.top: desc.bottom
+            anchors.topMargin: 5
+            color: "#ECC089"
+            font.pointSize: 30
+            text: root.stock.stockPrice
+        }
+
+        Text {
+            id: priceChange
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.top: price.bottom
+            anchors.topMargin: 5
+            color: root.stock.stockPriceChanged < 0 ? "#A43D3D" : "#679B3A"
+            font.pointSize: 25
+            text: root.stock.stockPriceChanged + " (" + Math.abs(Math.round(root.stock.stockPriceChanged/(root.stock.stockPrice - root.stock.stockPriceChanged) * 100))/100  +"%)"
+        }
+
+        StockChart {
+            id: chart
+            anchors.bottom: parent.bottom
+            anchors.top : priceChange.bottom
+            anchors.topMargin: 30
+            width: parent.width
+            stockModel: root.stock
+            settings: root.settings
+        }
+    }
+}
diff --git a/examples/demos/stocqt/content/images/icon-calendar-anim.png b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png
index c5164d5183..c5164d5183 100644
--- a/examples/demos/stocqt/content/images/icon-calendar-anim.png
+++ b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png
diff --git a/examples/demos/stocqt/content/images/icon-calendar.png b/examples/quick/demos/stocqt/content/images/icon-calendar.png
index bd2857470b..bd2857470b 100644
--- a/examples/demos/stocqt/content/images/icon-calendar.png
+++ b/examples/quick/demos/stocqt/content/images/icon-calendar.png
diff --git a/examples/demos/stocqt/content/images/icon-items.png b/examples/quick/demos/stocqt/content/images/icon-items.png
index f951aa5009..f951aa5009 100644
--- a/examples/demos/stocqt/content/images/icon-items.png
+++ b/examples/quick/demos/stocqt/content/images/icon-items.png
diff --git a/examples/demos/stocqt/content/images/icon-settings.png b/examples/quick/demos/stocqt/content/images/icon-settings.png
index 222d998289..222d998289 100644
--- a/examples/demos/stocqt/content/images/icon-settings.png
+++ b/examples/quick/demos/stocqt/content/images/icon-settings.png
diff --git a/examples/demos/stocqt/content/images/logo.png b/examples/quick/demos/stocqt/content/images/logo.png
index 90c7c3ba3d..90c7c3ba3d 100644
--- a/examples/demos/stocqt/content/images/logo.png
+++ b/examples/quick/demos/stocqt/content/images/logo.png
diff --git a/examples/demos/stocqt/content/images/wheel-touch.png b/examples/quick/demos/stocqt/content/images/wheel-touch.png
index 11c8120ada..11c8120ada 100644
--- a/examples/demos/stocqt/content/images/wheel-touch.png
+++ b/examples/quick/demos/stocqt/content/images/wheel-touch.png
diff --git a/examples/demos/stocqt/content/images/wheel.png b/examples/quick/demos/stocqt/content/images/wheel.png
index 470a675b35..470a675b35 100644
--- a/examples/demos/stocqt/content/images/wheel.png
+++ b/examples/quick/demos/stocqt/content/images/wheel.png
diff --git a/examples/demos/stocqt/main.cpp b/examples/quick/demos/stocqt/main.cpp
index 779d204a24..d893aa5a04 100644
--- a/examples/demos/stocqt/main.cpp
+++ b/examples/quick/demos/stocqt/main.cpp
@@ -38,4 +38,4 @@
 **
 ****************************************************************************/
 #include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(stocqt)
+DECLARATIVE_EXAMPLE_MAIN(demos/stocqt/stocqt)
diff --git a/examples/quick/demos/stocqt/stocqt.pro b/examples/quick/demos/stocqt/stocqt.pro
new file mode 100644
index 0000000000..efe37cb722
--- /dev/null
+++ b/examples/quick/demos/stocqt/stocqt.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+RESOURCES += stocqt.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt
+INSTALLS += target
diff --git a/examples/quick/demos/stocqt/stocqt.qml b/examples/quick/demos/stocqt/stocqt.qml
new file mode 100644
index 0000000000..13c15d5397
--- /dev/null
+++ b/examples/quick/demos/stocqt/stocqt.qml
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "./content"
+
+ListView {
+    id: root
+    width: 320
+    height: 480
+    snapMode: ListView.SnapOneItem
+    focus: false
+    orientation: ListView.Horizontal
+    boundsBehavior: Flickable.StopAtBounds
+    currentIndex: 1
+
+    StockModel {
+        id: stock
+        stockId: listView.currentStockId
+        stockName: listView.currentStockName
+        startDate: settings.startDate
+        endDate: settings.endDate
+        onStockIdChanged: updateStock()
+        onStartDateChanged: updateStock()
+        onEndDateChanged: updateStock()
+        onDataReady: {
+            root.currentIndex = 1
+            stockView.update()
+        }
+    }
+
+    model: VisualItemModel {
+        StockListView {
+            id: listView
+            width: root.width
+            height: root.height
+        }
+
+        StockView {
+            id: stockView
+            width: root.width
+            height: root.height
+            stocklist: listView
+            settings: settings
+            stock: stock
+
+            onListViewClicked: root.currentIndex = 0
+            onSettingsClicked: root.currentIndex = 2
+        }
+
+        StockSettings {
+            id: settings
+            width: root.width
+            height: root.height
+            onDrawHighPriceChanged: stockView.update()
+            onDrawLowPriceChanged: stockView.update()
+            onDrawOpenPriceChanged: stockView.update()
+            onDrawClosePriceChanged: stockView.update()
+            onDrawVolumeChanged: stockView.update()
+            onDrawKLineChanged: stockView.update()
+            onChartTypeChanged: stockView.update()
+        }
+    }
+}
diff --git a/examples/demos/stocqt/stocqt.qmlproject b/examples/quick/demos/stocqt/stocqt.qmlproject
index 11ab78418a..11ab78418a 100644
--- a/examples/demos/stocqt/stocqt.qmlproject
+++ b/examples/quick/demos/stocqt/stocqt.qmlproject
diff --git a/examples/quick/demos/stocqt/stocqt.qrc b/examples/quick/demos/stocqt/stocqt.qrc
new file mode 100644
index 0000000000..8885aaa807
--- /dev/null
+++ b/examples/quick/demos/stocqt/stocqt.qrc
@@ -0,0 +1,21 @@
+<RCC>
+    <qresource prefix="/demos/stocqt">
+        <file>stocqt.qml</file>
+        <file>content/Button.qml</file>
+        <file>content/CheckBox.qml</file>
+        <file>content/DatePicker.qml</file>
+        <file>content/StockChart.qml</file>
+        <file>content/StockListModel.qml</file>
+        <file>content/StockListView.qml</file>
+        <file>content/StockModel.qml</file>
+        <file>content/StockSettings.qml</file>
+        <file>content/StockView.qml</file>
+        <file>content/images/icon-calendar-anim.png</file>
+        <file>content/images/icon-calendar.png</file>
+        <file>content/images/icon-items.png</file>
+        <file>content/images/icon-settings.png</file>
+        <file>content/images/logo.png</file>
+        <file>content/images/wheel-touch.png</file>
+        <file>content/images/wheel.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/demos/tweetsearch/content/FlipBar.qml b/examples/quick/demos/tweetsearch/content/FlipBar.qml
index 06aebcacb1..06aebcacb1 100644
--- a/examples/demos/tweetsearch/content/FlipBar.qml
+++ b/examples/quick/demos/tweetsearch/content/FlipBar.qml
diff --git a/examples/demos/tweetsearch/content/LineInput.qml b/examples/quick/demos/tweetsearch/content/LineInput.qml
index 368293e961..368293e961 100644
--- a/examples/demos/tweetsearch/content/LineInput.qml
+++ b/examples/quick/demos/tweetsearch/content/LineInput.qml
diff --git a/examples/demos/tweetsearch/content/ListFooter.qml b/examples/quick/demos/tweetsearch/content/ListFooter.qml
index 91c1c8b331..91c1c8b331 100644
--- a/examples/demos/tweetsearch/content/ListFooter.qml
+++ b/examples/quick/demos/tweetsearch/content/ListFooter.qml
diff --git a/examples/demos/tweetsearch/content/ListHeader.qml b/examples/quick/demos/tweetsearch/content/ListHeader.qml
index 2fb673dc7c..2fb673dc7c 100644
--- a/examples/demos/tweetsearch/content/ListHeader.qml
+++ b/examples/quick/demos/tweetsearch/content/ListHeader.qml
diff --git a/examples/demos/tweetsearch/content/SearchDelegate.qml b/examples/quick/demos/tweetsearch/content/SearchDelegate.qml
index fc0ee0b655..fc0ee0b655 100644
--- a/examples/demos/tweetsearch/content/SearchDelegate.qml
+++ b/examples/quick/demos/tweetsearch/content/SearchDelegate.qml
diff --git a/examples/demos/tweetsearch/content/TweetDelegate.qml b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml
index c336ae6f8a..c336ae6f8a 100644
--- a/examples/demos/tweetsearch/content/TweetDelegate.qml
+++ b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml
diff --git a/examples/demos/tweetsearch/content/TweetsModel.qml b/examples/quick/demos/tweetsearch/content/TweetsModel.qml
index df6ecdcd7f..df6ecdcd7f 100644
--- a/examples/demos/tweetsearch/content/TweetsModel.qml
+++ b/examples/quick/demos/tweetsearch/content/TweetsModel.qml
diff --git a/examples/demos/tweetsearch/content/resources/anonymous.png b/examples/quick/demos/tweetsearch/content/resources/anonymous.png
index 88fba26e90..88fba26e90 100644
--- a/examples/demos/tweetsearch/content/resources/anonymous.png
+++ b/examples/quick/demos/tweetsearch/content/resources/anonymous.png
diff --git a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png b/examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png
index 4e8d7e6116..4e8d7e6116 100644
--- a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png
+++ b/examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-clear.png b/examples/quick/demos/tweetsearch/content/resources/icon-clear.png
index 75672f64c7..75672f64c7 100644
--- a/examples/demos/tweetsearch/content/resources/icon-clear.png
+++ b/examples/quick/demos/tweetsearch/content/resources/icon-clear.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-loading.png b/examples/quick/demos/tweetsearch/content/resources/icon-loading.png
index 8dbff8b70f..8dbff8b70f 100644
--- a/examples/demos/tweetsearch/content/resources/icon-loading.png
+++ b/examples/quick/demos/tweetsearch/content/resources/icon-loading.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-refresh.png b/examples/quick/demos/tweetsearch/content/resources/icon-refresh.png
index b639a638fe..b639a638fe 100644
--- a/examples/demos/tweetsearch/content/resources/icon-refresh.png
+++ b/examples/quick/demos/tweetsearch/content/resources/icon-refresh.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-search.png b/examples/quick/demos/tweetsearch/content/resources/icon-search.png
index e41935a6c1..e41935a6c1 100644
--- a/examples/demos/tweetsearch/content/resources/icon-search.png
+++ b/examples/quick/demos/tweetsearch/content/resources/icon-search.png
diff --git a/examples/demos/tweetsearch/content/tweetsearch.js b/examples/quick/demos/tweetsearch/content/tweetsearch.js
index 9b8638f69e..9b8638f69e 100644
--- a/examples/demos/tweetsearch/content/tweetsearch.js
+++ b/examples/quick/demos/tweetsearch/content/tweetsearch.js
diff --git a/examples/quick/demos/tweetsearch/main.cpp b/examples/quick/demos/tweetsearch/main.cpp
new file mode 100644
index 0000000000..6253bc2f6b
--- /dev/null
+++ b/examples/quick/demos/tweetsearch/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(demos/tweetsearch/tweetsearch)
diff --git a/examples/quick/demos/tweetsearch/tweetsearch.pro b/examples/quick/demos/tweetsearch/tweetsearch.pro
new file mode 100644
index 0000000000..b063cc4106
--- /dev/null
+++ b/examples/quick/demos/tweetsearch/tweetsearch.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += tweetsearch.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch
+INSTALLS += target
diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/quick/demos/tweetsearch/tweetsearch.qml
index 961ffce36b..961ffce36b 100644
--- a/examples/demos/tweetsearch/tweetsearch.qml
+++ b/examples/quick/demos/tweetsearch/tweetsearch.qml
diff --git a/examples/demos/tweetsearch/tweetsearch.qmlproject b/examples/quick/demos/tweetsearch/tweetsearch.qmlproject
index 5a0f31117b..5a0f31117b 100644
--- a/examples/demos/tweetsearch/tweetsearch.qmlproject
+++ b/examples/quick/demos/tweetsearch/tweetsearch.qmlproject
diff --git a/examples/quick/demos/tweetsearch/tweetsearch.qrc b/examples/quick/demos/tweetsearch/tweetsearch.qrc
new file mode 100644
index 0000000000..b23c3c5537
--- /dev/null
+++ b/examples/quick/demos/tweetsearch/tweetsearch.qrc
@@ -0,0 +1,19 @@
+<RCC>
+    <qresource prefix="/demos/tweetsearch">
+        <file>tweetsearch.qml</file>
+        <file>content/FlipBar.qml</file>
+        <file>content/LineInput.qml</file>
+        <file>content/ListFooter.qml</file>
+        <file>content/ListHeader.qml</file>
+        <file>content/SearchDelegate.qml</file>
+        <file>content/TweetDelegate.qml</file>
+        <file>content/tweetsearch.js</file>
+        <file>content/TweetsModel.qml</file>
+        <file>content/resources/anonymous.png</file>
+        <file>content/resources/bird-anim-sprites.png</file>
+        <file>content/resources/icon-clear.png</file>
+        <file>content/resources/icon-loading.png</file>
+        <file>content/resources/icon-refresh.png</file>
+        <file>content/resources/icon-search.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro
index 7ec3e0e58a..e62b936aa8 100644
--- a/examples/quick/draganddrop/draganddrop.pro
+++ b/examples/quick/draganddrop/draganddrop.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    draganddrop.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
-qml.files = draganddrop.qml tiles views
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
-sources.files = $$SOURCES draganddrop.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop
+INSTALLS += target
diff --git a/examples/quick/draganddrop/draganddrop.qml b/examples/quick/draganddrop/draganddrop.qml
index 300a7abb20..234ea8b806 100644
--- a/examples/quick/draganddrop/draganddrop.qml
+++ b/examples/quick/draganddrop/draganddrop.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/draganddrop/draganddrop.qrc b/examples/quick/draganddrop/draganddrop.qrc
new file mode 100644
index 0000000000..6d064f7722
--- /dev/null
+++ b/examples/quick/draganddrop/draganddrop.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/draganddrop">
+        <file>draganddrop.qml</file>
+        <file>tiles/DragTile.qml</file>
+        <file>tiles/DropTile.qml</file>
+        <file>tiles/tiles.qml</file>
+        <file>views/gridview.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/draganddrop/main.cpp b/examples/quick/draganddrop/main.cpp
index cc08df9ff4..d9bf43695a 100644
--- a/examples/quick/draganddrop/main.cpp
+++ b/examples/quick/draganddrop/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(draganddrop)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(draganddrop/draganddrop)
diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro
index eddfb7429a..4d1c6f0a95 100644
--- a/examples/quick/imageelements/imageelements.pro
+++ b/examples/quick/imageelements/imageelements.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    imageelements.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
-qml.files = *.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
-sources.files = $$SOURCES imageelements.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements
+INSTALLS += target
diff --git a/examples/quick/imageelements/imageelements.qml b/examples/quick/imageelements/imageelements.qml
index 22ab45866b..a68ed3e73a 100644
--- a/examples/quick/imageelements/imageelements.qml
+++ b/examples/quick/imageelements/imageelements.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/quick/imageelements/imageelements.qrc b/examples/quick/imageelements/imageelements.qrc
new file mode 100644
index 0000000000..ef8a9e52cb
--- /dev/null
+++ b/examples/quick/imageelements/imageelements.qrc
@@ -0,0 +1,23 @@
+<RCC>
+    <qresource prefix="/imageelements">
+        <file>content/arrow.png</file>
+        <file>content/BearSheet.png</file>
+        <file>content/BorderImageSelector.qml</file>
+        <file>content/bw.png</file>
+        <file>content/colors-round.sci</file>
+        <file>content/colors-stretch.sci</file>
+        <file>content/colors.png</file>
+        <file>content/ImageCell.qml</file>
+        <file>content/MyBorderImage.qml</file>
+        <file>content/qt-logo.png</file>
+        <file>content/shadow.png</file>
+        <file>content/ShadowRectangle.qml</file>
+        <file>content/speaker.png</file>
+        <file>imageelements.qml</file>
+        <file>animatedsprite.qml</file>
+        <file>borderimage.qml</file>
+        <file>image.qml</file>
+        <file>shadows.qml</file>
+        <file>spritesequence.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/imageelements/main.cpp b/examples/quick/imageelements/main.cpp
index af4674e102..ab7d5215fa 100644
--- a/examples/quick/imageelements/main.cpp
+++ b/examples/quick/imageelements/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(imageelements)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(imageelements/imageelements)
diff --git a/examples/qml/imageprovider/ImageProviderCore/qmldir b/examples/quick/imageprovider/ImageProviderCore/qmldir
index 6be88bccec..6be88bccec 100644
--- a/examples/qml/imageprovider/ImageProviderCore/qmldir
+++ b/examples/quick/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/qml/imageprovider/imageprovider-example.qml b/examples/quick/imageprovider/imageprovider-example.qml
index 444a3447a5..444a3447a5 100644
--- a/examples/qml/imageprovider/imageprovider-example.qml
+++ b/examples/quick/imageprovider/imageprovider-example.qml
diff --git a/examples/qml/imageprovider/imageprovider.cpp b/examples/quick/imageprovider/imageprovider.cpp
index f752691125..f752691125 100644
--- a/examples/qml/imageprovider/imageprovider.cpp
+++ b/examples/quick/imageprovider/imageprovider.cpp
diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro
new file mode 100644
index 0000000000..5567a2d6d9
--- /dev/null
+++ b/examples/quick/imageprovider/imageprovider.pro
@@ -0,0 +1,15 @@
+TEMPLATE = lib
+CONFIG += plugin
+QT += qml quick
+
+DESTDIR = ImageProviderCore
+TARGET  = qmlimageproviderplugin
+
+SOURCES += imageprovider.cpp
+
+EXAMPLE_FILES = imageprovider-example.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore
+qml.files = ImageProviderCore/qmldir
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore
+INSTALLS = target qml
diff --git a/examples/qml/imageprovider/imageprovider.qmlproject b/examples/quick/imageprovider/imageprovider.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/qml/imageprovider/imageprovider.qmlproject
+++ b/examples/quick/imageprovider/imageprovider.qmlproject
diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro
index 740001362e..edc157f028 100644
--- a/examples/quick/keyinteraction/keyinteraction.pro
+++ b/examples/quick/keyinteraction/keyinteraction.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += keyinteraction.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
-qml.files = keyinteraction.qml focus
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
-sources.files = $$SOURCES keyinteraction.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction
+INSTALLS += target
diff --git a/examples/quick/keyinteraction/keyinteraction.qml b/examples/quick/keyinteraction/keyinteraction.qml
index 66a003172e..d10a028c7e 100644
--- a/examples/quick/keyinteraction/keyinteraction.qml
+++ b/examples/quick/keyinteraction/keyinteraction.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
 
 Loader {//Just loader, since there's only one.
     source: "focus/focus.qml"
diff --git a/examples/quick/keyinteraction/keyinteraction.qrc b/examples/quick/keyinteraction/keyinteraction.qrc
new file mode 100644
index 0000000000..21bde4472c
--- /dev/null
+++ b/examples/quick/keyinteraction/keyinteraction.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/keyinteraction">
+        <file>keyinteraction.qml</file>
+        <file>focus/focus.qml</file>
+        <file>focus/Core/images/arrow.png</file>
+        <file>focus/Core/images/qt-logo.png</file>
+        <file>focus/Core/ContextMenu.qml</file>
+        <file>focus/Core/GridMenu.qml</file>
+        <file>focus/Core/ListMenu.qml</file>
+        <file>focus/Core/ListViewDelegate.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/keyinteraction/main.cpp b/examples/quick/keyinteraction/main.cpp
index bbef71aec7..4f226e715a 100644
--- a/examples/quick/keyinteraction/main.cpp
+++ b/examples/quick/keyinteraction/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(keyinteraction)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(keyinteraction/keyinteraction)
diff --git a/examples/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc
index 45456abbab..45456abbab 100644
--- a/examples/localstorage/doc/src/localstorage.qdoc
+++ b/examples/quick/localstorage/doc/src/localstorage.qdoc
diff --git a/examples/quick/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage.pro
new file mode 100644
index 0000000000..dd2eb80250
--- /dev/null
+++ b/examples/quick/localstorage/localstorage.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += localstorage
diff --git a/examples/localstorage/localstorage/hello.qml b/examples/quick/localstorage/localstorage/hello.qml
index 5a25052675..5a25052675 100644
--- a/examples/localstorage/localstorage/hello.qml
+++ b/examples/quick/localstorage/localstorage/hello.qml
diff --git a/examples/quick/localstorage/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage/localstorage.pro
new file mode 100644
index 0000000000..80c306fcc2
--- /dev/null
+++ b/examples/quick/localstorage/localstorage/localstorage.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    localstorage.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage
+INSTALLS += target
diff --git a/examples/localstorage/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage/localstorage.qml
index c5b045460d..c5b045460d 100644
--- a/examples/localstorage/localstorage/localstorage.qml
+++ b/examples/quick/localstorage/localstorage/localstorage.qml
diff --git a/examples/localstorage/localstorage/localstorage.qmlproject b/examples/quick/localstorage/localstorage/localstorage.qmlproject
index 6835d23503..6835d23503 100644
--- a/examples/localstorage/localstorage/localstorage.qmlproject
+++ b/examples/quick/localstorage/localstorage/localstorage.qmlproject
diff --git a/examples/quick/localstorage/localstorage/localstorage.qrc b/examples/quick/localstorage/localstorage/localstorage.qrc
new file mode 100644
index 0000000000..09ac2de033
--- /dev/null
+++ b/examples/quick/localstorage/localstorage/localstorage.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/localstorage/localstorage">
+        <file>hello.qml</file>
+        <file>localstorage.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/localstorage/localstorage/main.cpp b/examples/quick/localstorage/localstorage/main.cpp
new file mode 100644
index 0000000000..8433dbe55e
--- /dev/null
+++ b/examples/quick/localstorage/localstorage/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(localstorage/localstorage/localstorage)
diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/quick/models/abstractitemmodel/abstractitemmodel.pro
index cde1d2f83c..d508147da7 100644
--- a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/quick/models/abstractitemmodel/abstractitemmodel.pro
@@ -5,3 +5,6 @@ HEADERS = model.h
 SOURCES = main.cpp \
           model.cpp
 RESOURCES += abstractitemmodel.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/models/abstractitemmodel
+INSTALLS += target
diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
index 4ae861cb3d..4ae861cb3d 100644
--- a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ b/examples/quick/models/abstractitemmodel/abstractitemmodel.qrc
diff --git a/examples/quick/modelviews/abstractitemmodel/main.cpp b/examples/quick/models/abstractitemmodel/main.cpp
index 84fea90aa3..84fea90aa3 100644
--- a/examples/quick/modelviews/abstractitemmodel/main.cpp
+++ b/examples/quick/models/abstractitemmodel/main.cpp
diff --git a/examples/quick/modelviews/abstractitemmodel/model.cpp b/examples/quick/models/abstractitemmodel/model.cpp
index 9c24decf2d..524ed5461b 100644
--- a/examples/quick/modelviews/abstractitemmodel/model.cpp
+++ b/examples/quick/models/abstractitemmodel/model.cpp
@@ -54,16 +54,10 @@ QString Animal::size() const
     return m_size;
 }
 
-//![0]
 AnimalModel::AnimalModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    QHash<int, QByteArray> roles;
-    roles[TypeRole] = "type";
-    roles[SizeRole] = "size";
-    setRoleNames(roles);
 }
-//![0]
 
 void AnimalModel::addAnimal(const Animal &animal)
 {
@@ -88,3 +82,12 @@ QVariant AnimalModel::data(const QModelIndex & index, int role) const {
     return QVariant();
 }
 
+//![0]
+QHash<int, QByteArray> AnimalModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[TypeRole] = "type";
+    roles[SizeRole] = "size";
+    return roles;
+}
+//![0]
+
diff --git a/examples/quick/modelviews/abstractitemmodel/model.h b/examples/quick/models/abstractitemmodel/model.h
index 9436770b19..2db178bae1 100644
--- a/examples/quick/modelviews/abstractitemmodel/model.h
+++ b/examples/quick/models/abstractitemmodel/model.h
@@ -74,6 +74,8 @@ public:
 
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
 
+protected:
+    QHash<int, QByteArray> roleNames() const;
 private:
     QList<Animal> m_animals;
 //![2]
diff --git a/examples/quick/modelviews/abstractitemmodel/view.qml b/examples/quick/models/abstractitemmodel/view.qml
index 6a9c90dcfc..6a9c90dcfc 100644
--- a/examples/quick/modelviews/abstractitemmodel/view.qml
+++ b/examples/quick/models/abstractitemmodel/view.qml
diff --git a/examples/quick/models/models.pro b/examples/quick/models/models.pro
new file mode 100644
index 0000000000..95d2716836
--- /dev/null
+++ b/examples/quick/models/models.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+    abstractitemmodel \
+    objectlistmodel \
+    stringlistmodel
diff --git a/examples/quick/modelviews/objectlistmodel/dataobject.cpp b/examples/quick/models/objectlistmodel/dataobject.cpp
index e26aa832ca..e26aa832ca 100644
--- a/examples/quick/modelviews/objectlistmodel/dataobject.cpp
+++ b/examples/quick/models/objectlistmodel/dataobject.cpp
diff --git a/examples/quick/modelviews/objectlistmodel/dataobject.h b/examples/quick/models/objectlistmodel/dataobject.h
index 57b5fdabf5..57b5fdabf5 100644
--- a/examples/quick/modelviews/objectlistmodel/dataobject.h
+++ b/examples/quick/models/objectlistmodel/dataobject.h
diff --git a/examples/quick/modelviews/objectlistmodel/main.cpp b/examples/quick/models/objectlistmodel/main.cpp
index 7fc23aff09..7fc23aff09 100644
--- a/examples/quick/modelviews/objectlistmodel/main.cpp
+++ b/examples/quick/models/objectlistmodel/main.cpp
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.pro b/examples/quick/models/objectlistmodel/objectlistmodel.pro
index 7f323c3999..0d22412801 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.pro
@@ -4,3 +4,6 @@ SOURCES += main.cpp \
            dataobject.cpp
 HEADERS += dataobject.h
 RESOURCES += objectlistmodel.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/models/objectlistmodel
+INSTALLS += target
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qmlproject b/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qmlproject
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.qmlproject
diff --git a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/quick/modelviews/objectlistmodel/objectlistmodel.qrc
+++ b/examples/quick/models/objectlistmodel/objectlistmodel.qrc
diff --git a/examples/quick/modelviews/objectlistmodel/view.qml b/examples/quick/models/objectlistmodel/view.qml
index a62e89329f..a62e89329f 100644
--- a/examples/quick/modelviews/objectlistmodel/view.qml
+++ b/examples/quick/models/objectlistmodel/view.qml
diff --git a/examples/quick/modelviews/stringlistmodel/main.cpp b/examples/quick/models/stringlistmodel/main.cpp
index 780a99cf68..780a99cf68 100644
--- a/examples/quick/modelviews/stringlistmodel/main.cpp
+++ b/examples/quick/models/stringlistmodel/main.cpp
diff --git a/examples/quick/models/stringlistmodel/stringlistmodel.pro b/examples/quick/models/stringlistmodel/stringlistmodel.pro
new file mode 100644
index 0000000000..2d1f99d4ed
--- /dev/null
+++ b/examples/quick/models/stringlistmodel/stringlistmodel.pro
@@ -0,0 +1,7 @@
+QT += qml quick
+
+SOURCES += main.cpp 
+RESOURCES += stringlistmodel.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/models/stringlistmodel
+INSTALLS += target
diff --git a/examples/quick/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/quick/modelviews/stringlistmodel/stringlistmodel.qrc
+++ b/examples/quick/models/stringlistmodel/stringlistmodel.qrc
diff --git a/examples/quick/modelviews/stringlistmodel/view.qml b/examples/quick/models/stringlistmodel/view.qml
index 2d02f0a2d4..2d02f0a2d4 100644
--- a/examples/quick/modelviews/stringlistmodel/view.qml
+++ b/examples/quick/models/stringlistmodel/view.qml
diff --git a/examples/quick/modelviews/main.cpp b/examples/quick/modelviews/main.cpp
deleted file mode 100644
index 082001cad2..0000000000
--- a/examples/quick/modelviews/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(modelviews)
diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro
deleted file mode 100644
index 695c010263..0000000000
--- a/examples/quick/modelviews/modelviews.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews
-qml.files = \
-        modelviews.qml \
-        gridview \
-        listview \
-        package \
-        parallax \
-        pathview \
-        visualdatamodel \
-        visualitemmodel
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews
-sources.files = $$SOURCES modelviews.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/quick/modelviews/modelviews.qml b/examples/quick/modelviews/modelviews.qml
deleted file mode 100644
index d86bbf3416..0000000000
--- a/examples/quick/modelviews/modelviews.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../../shared" as Examples
-
-Item {
-    height: 480
-    width: 320
-    Examples.LauncherList {
-        id: ll
-        anchors.fill: parent
-        Component.onCompleted: {
-            addExample("GridView", "A simple GridView", Qt.resolvedUrl("gridview/gridview-example.qml"))
-            addExample("Dynamic List", "A dynamically alterable list", Qt.resolvedUrl("listview/dynamiclist.qml"))
-            addExample("Expanding Delegates", "A ListView with delegates that expand", Qt.resolvedUrl("listview/expandingdelegates.qml"))
-            addExample("Highlight", "A ListView with a custom highlight", Qt.resolvedUrl("listview/highlight.qml"))
-            addExample("Highlight Ranges", "The three highlight ranges of ListView", Qt.resolvedUrl("listview/highlightranges.qml"))
-            addExample("Sections", "ListView section headers and footers", Qt.resolvedUrl("listview/sections.qml"))
-            addExample("Packages", "Transitions between a ListView and GridView", Qt.resolvedUrl("package/view.qml"))
-            addExample("PathView", "A simple PathView", Qt.resolvedUrl("pathview/pathview-example.qml"))
-            addExample("VisualItemModel", "Using a VisualItemModel", Qt.resolvedUrl("visualitemmodel/visualitemmodel.qml"))
-        }
-    }
-}
diff --git a/examples/quick/modelviews/modelviews.qmlproject b/examples/quick/modelviews/modelviews.qmlproject
deleted file mode 100644
index 40f9e568fd..0000000000
--- a/examples/quick/modelviews/modelviews.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "modelviews.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
diff --git a/examples/quick/modelviews/stringlistmodel/stringlistmodel.pro b/examples/quick/modelviews/stringlistmodel/stringlistmodel.pro
deleted file mode 100644
index 19e62cd1b7..0000000000
--- a/examples/quick/modelviews/stringlistmodel/stringlistmodel.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-QT += qml quick
-
-SOURCES += main.cpp 
-RESOURCES += stringlistmodel.qrc
diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp
index d7fccf8f6c..f07341c4ca 100644
--- a/examples/quick/mousearea/main.cpp
+++ b/examples/quick/mousearea/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(mousearea)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(mousearea/mousearea)
diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro
index cb876e41b5..782082924e 100644
--- a/examples/quick/mousearea/mousearea.pro
+++ b/examples/quick/mousearea/mousearea.pro
@@ -2,10 +2,10 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += mousearea.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
-qml.files = mousearea.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
-sources.files = $$SOURCES mousearea.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+EXAMPLE_FILES = \
+    mousearea-wheel-example.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea
+INSTALLS += target
diff --git a/examples/quick/mousearea/mousearea.qml b/examples/quick/mousearea/mousearea.qml
index fb912af7b5..efadfcfed3 100644
--- a/examples/quick/mousearea/mousearea.qml
+++ b/examples/quick/mousearea/mousearea.qml
@@ -152,7 +152,7 @@ Rectangle {
             anchors.fill: parent
             //! [drag]
             drag.target: blueSquare
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: box.width - parent.width
             drag.minimumY: 0
diff --git a/examples/quick/mousearea/mousearea.qrc b/examples/quick/mousearea/mousearea.qrc
new file mode 100644
index 0000000000..23d30aa37c
--- /dev/null
+++ b/examples/quick/mousearea/mousearea.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/mousearea">
+        <file>mousearea.qml</file>
+        <file>mousearea-wheel-example.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/particles/affectors/affectors.pro b/examples/quick/particles/affectors/affectors.pro
new file mode 100644
index 0000000000..673ccfbb81
--- /dev/null
+++ b/examples/quick/particles/affectors/affectors.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    affectors.qrc \
+    ../images.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors
+INSTALLS += target
diff --git a/examples/particles/affectors/affectors.qml b/examples/quick/particles/affectors/affectors.qml
index f8e132c2c0..f8e132c2c0 100644
--- a/examples/particles/affectors/affectors.qml
+++ b/examples/quick/particles/affectors/affectors.qml
diff --git a/examples/particles/affectors/affectors.qmlproject b/examples/quick/particles/affectors/affectors.qmlproject
index 2bf3387155..2bf3387155 100644
--- a/examples/particles/affectors/affectors.qmlproject
+++ b/examples/quick/particles/affectors/affectors.qmlproject
diff --git a/examples/quick/particles/affectors/affectors.qrc b/examples/quick/particles/affectors/affectors.qrc
new file mode 100644
index 0000000000..c1d797e4d8
--- /dev/null
+++ b/examples/quick/particles/affectors/affectors.qrc
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/particles/affectors">
+        <file>affectors.qml</file>
+        <file>content/age.qml</file>
+        <file>content/attractor.qml</file>
+        <file>content/customaffector.qml</file>
+        <file>content/friction.qml</file>
+        <file>content/gravity.qml</file>
+        <file>content/GreyButton.qml</file>
+        <file>content/groupgoal.qml</file>
+        <file>content/move.qml</file>
+        <file>content/spritegoal.qml</file>
+        <file>content/turbulence.qml</file>
+        <file>content/wander.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/particles/affectors/content/GreyButton.qml b/examples/quick/particles/affectors/content/GreyButton.qml
index e3d3daa470..e3d3daa470 100644
--- a/examples/particles/affectors/content/GreyButton.qml
+++ b/examples/quick/particles/affectors/content/GreyButton.qml
diff --git a/examples/particles/affectors/content/age.qml b/examples/quick/particles/affectors/content/age.qml
index 9b8d28dc7e..9b8d28dc7e 100644
--- a/examples/particles/affectors/content/age.qml
+++ b/examples/quick/particles/affectors/content/age.qml
diff --git a/examples/particles/affectors/content/attractor.qml b/examples/quick/particles/affectors/content/attractor.qml
index 5617f6eb86..5617f6eb86 100644
--- a/examples/particles/affectors/content/attractor.qml
+++ b/examples/quick/particles/affectors/content/attractor.qml
diff --git a/examples/particles/affectors/content/customaffector.qml b/examples/quick/particles/affectors/content/customaffector.qml
index 157bf6afc1..157bf6afc1 100644
--- a/examples/particles/affectors/content/customaffector.qml
+++ b/examples/quick/particles/affectors/content/customaffector.qml
diff --git a/examples/particles/affectors/content/friction.qml b/examples/quick/particles/affectors/content/friction.qml
index aaf5917ee7..aaf5917ee7 100644
--- a/examples/particles/affectors/content/friction.qml
+++ b/examples/quick/particles/affectors/content/friction.qml
diff --git a/examples/particles/affectors/content/gravity.qml b/examples/quick/particles/affectors/content/gravity.qml
index 123657f56a..123657f56a 100644
--- a/examples/particles/affectors/content/gravity.qml
+++ b/examples/quick/particles/affectors/content/gravity.qml
diff --git a/examples/particles/affectors/content/groupgoal.qml b/examples/quick/particles/affectors/content/groupgoal.qml
index e36a52526f..e36a52526f 100644
--- a/examples/particles/affectors/content/groupgoal.qml
+++ b/examples/quick/particles/affectors/content/groupgoal.qml
diff --git a/examples/particles/affectors/content/move.qml b/examples/quick/particles/affectors/content/move.qml
index 7bee550e13..7bee550e13 100644
--- a/examples/particles/affectors/content/move.qml
+++ b/examples/quick/particles/affectors/content/move.qml
diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml
index 28ba4ecbfc..28ba4ecbfc 100644
--- a/examples/particles/affectors/content/spritegoal.qml
+++ b/examples/quick/particles/affectors/content/spritegoal.qml
diff --git a/examples/particles/affectors/content/turbulence.qml b/examples/quick/particles/affectors/content/turbulence.qml
index b80aa7ee1c..b80aa7ee1c 100644
--- a/examples/particles/affectors/content/turbulence.qml
+++ b/examples/quick/particles/affectors/content/turbulence.qml
diff --git a/examples/particles/affectors/content/wander.qml b/examples/quick/particles/affectors/content/wander.qml
index f8ac7bae40..67f96acbda 100644
--- a/examples/particles/affectors/content/wander.qml
+++ b/examples/quick/particles/affectors/content/wander.qml
@@ -40,7 +40,6 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "../../../shared" as UI //Has a shared UI element
 
 Rectangle {
     width: 360
diff --git a/examples/particles/affectors/doc/images/qml-affectors-example.png b/examples/quick/particles/affectors/doc/images/qml-affectors-example.png
index 748afa65e5..748afa65e5 100644
--- a/examples/particles/affectors/doc/images/qml-affectors-example.png
+++ b/examples/quick/particles/affectors/doc/images/qml-affectors-example.png
diff --git a/examples/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc
index 96f2182e78..c0759f5fe3 100644
--- a/examples/particles/affectors/doc/src/affectors.qdoc
+++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc
@@ -35,7 +35,7 @@
     Each example is a small QML file emphasizing a particular element or feature.
 
     Age demonstrates using an Age affector to prematurely end the lives of particles.
-    \snippet examples/particles/affectors/content/age.qml 0
+    \snippet particles/affectors/content/age.qml 0
 
     As you move the affector around the screen, the particles inside it
     (which haven't already been affected) jump to a period near the end
@@ -44,7 +44,7 @@
     the end of their life instantly.
 
     Attractor demonstrates using an Attractor affector to simulate a black hole
-    \snippet examples/particles/affectors/content/attractor.qml 0
+    \snippet particles/affectors/content/attractor.qml 0
 
     All particles in the scene, including the rocket ship's exhaust and pellets, are pulled
     towards the black hole. This effect is stronger closer to the black hole, so the
@@ -55,59 +55,59 @@
     Custom Affector manipulates the properties of the particles directly in javascript.
     One Affector is used to make the leaves rock back and forth as they fall, looking more
     leaf-like than just spinning in circles:
-    \snippet examples/particles/affectors/content/customaffector.qml 0
+    \snippet particles/affectors/content/customaffector.qml 0
     Another is used to provide a slightly varying friction to the leaves as they 'land',
     to look more natural:
-    \snippet examples/particles/affectors/content/customaffector.qml 1
+    \snippet particles/affectors/content/customaffector.qml 1
 
     Friction is similar to the falling leaves in the custom affector, except that it uses a
     flat friction the whole way down instead of custom affectors.
-    \snippet examples/particles/affectors/content/friction.qml 0
+    \snippet particles/affectors/content/friction.qml 0
 
     Gravity is a convenience affector for applying a constant acceleration to particles inside it
-    \snippet examples/particles/affectors/content/gravity.qml 0
+    \snippet particles/affectors/content/gravity.qml 0
 
     GroupGoal sets up two particle groups for flaming and non-flaming balls, and gives you various
     ways to transition between them.
-    \snippet examples/particles/affectors/content/groupgoal.qml unlit
+    \snippet particles/affectors/content/groupgoal.qml unlit
     The non-flaming balls have a one in a hundred chance of lighting on their own each second, but they also
     have a GroupGoal set on the whole group. This affector affects all particles of the unlit group, when colliding
     with particles in the lit group, and cause them to move to the lighting group.
-    \snippet examples/particles/affectors/content/groupgoal.qml lighting
+    \snippet particles/affectors/content/groupgoal.qml lighting
     lighting is an intermediate group so that the glow builds up and the transition is less jarring. So it automatically
     moves into the lit group after 100ms.
-    \snippet examples/particles/affectors/content/groupgoal.qml lit
+    \snippet particles/affectors/content/groupgoal.qml lit
     The lit group also has TrailEmitters on it for additional fire and smoke, but does not transition anywhere.
     There are two more GroupGoal elements that allow particles in the unlit group to transition to the lighting group
     (and then to the lit group).
-    \snippet examples/particles/affectors/content/groupgoal.qml groupgoal-pilot
+    \snippet particles/affectors/content/groupgoal.qml groupgoal-pilot
     The first is just an area bound to the location of an image of a pilot flame. When unlit balls pass through the flame,
     they go straight to lit because the pilot flame is so hot.
-    \snippet examples/particles/affectors/content/groupgoal.qml groupgoal-ma
+    \snippet particles/affectors/content/groupgoal.qml groupgoal-ma
     The second is bound to the location of the last pointer interaction, so that touching or clicking on unlit balls (which
     is hard due to their constant movement) causes them to move to the lighting group.
 
     Move shows some simple effects you can get by altering trajectory midway.
     The red particles have an affector that affects their position, jumping them forwards by 120px.
-    \snippet examples/particles/affectors/content/move.qml A
+    \snippet particles/affectors/content/move.qml A
     The green particles have an affector that affects their velocity, but with some angle variation. By adding some random direction
     velocity to their existing forwards velocity, they begin to spray off in a cone.
-    \snippet examples/particles/affectors/content/move.qml B
+    \snippet particles/affectors/content/move.qml B
     The blue particles have an affector that affects their acceleration, and because it sets relative to false this resets the acceleration instead of
     adding to it. Once the blue particles reach the affector, their horizontal velocity stops increasing as their vertical velocity decreases.
-    \snippet examples/particles/affectors/content/move.qml C
+    \snippet particles/affectors/content/move.qml C
 
     SpriteGoal has an affector which interacts with the sprite engine of particles, if they are being drawn as sprites by ImageParticle.
-    \snippet examples/particles/affectors/content/spritegoal.qml 0
+    \snippet particles/affectors/content/spritegoal.qml 0
     The SpriteGoal follows the image of the rocket ship on screen, and when it interacts with particles drawn by ImageParticle as sprites,
     it instructs them to move immediately to the "explode" state, which in this case is the animation of the asteroid breaking into many pieces.
 
     Turbulence has a flame with smoke, and both sets of particles being affected by a Turbulence affector. This gives a faint wind effect.
-    \snippet examples/particles/affectors/content/turbulence.qml 0
+    \snippet particles/affectors/content/turbulence.qml 0
     To make the wind change direction, subsitute a black and white noise image in the noiseSource parameter (it currently uses a default noise source).
 
     Wander uses a Wander affector to add some horizontal drift to snowflakes as they fall down.
-    \snippet examples/particles/affectors/content/wander.qml 0
+    \snippet particles/affectors/content/wander.qml 0
     There are different movements given by applying the Wander to different attributes of the trajectory, so the example makes it easy to play around and see the difference.
 */
 
diff --git a/examples/quick/particles/affectors/main.cpp b/examples/quick/particles/affectors/main.cpp
new file mode 100644
index 0000000000..76d79debc2
--- /dev/null
+++ b/examples/quick/particles/affectors/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(particles/affectors/affectors)
diff --git a/examples/particles/customparticle/content/blurparticles.qml b/examples/quick/particles/customparticle/content/blurparticles.qml
index 30197fe414..30197fe414 100644
--- a/examples/particles/customparticle/content/blurparticles.qml
+++ b/examples/quick/particles/customparticle/content/blurparticles.qml
diff --git a/examples/particles/customparticle/content/fragmentshader.qml b/examples/quick/particles/customparticle/content/fragmentshader.qml
index 2cea780f33..2cea780f33 100644
--- a/examples/particles/customparticle/content/fragmentshader.qml
+++ b/examples/quick/particles/customparticle/content/fragmentshader.qml
diff --git a/examples/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml
index 857375a05c..857375a05c 100644
--- a/examples/particles/customparticle/content/imagecolors.qml
+++ b/examples/quick/particles/customparticle/content/imagecolors.qml
diff --git a/examples/quick/particles/customparticle/customparticle.pro b/examples/quick/particles/customparticle/customparticle.pro
new file mode 100644
index 0000000000..66a6895d00
--- /dev/null
+++ b/examples/quick/particles/customparticle/customparticle.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    customparticle.qrc \
+    ../images.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle
+INSTALLS += target
+
diff --git a/examples/particles/customparticle/customparticle.qml b/examples/quick/particles/customparticle/customparticle.qml
index ee93648132..ee93648132 100644
--- a/examples/particles/customparticle/customparticle.qml
+++ b/examples/quick/particles/customparticle/customparticle.qml
diff --git a/examples/particles/customparticle/customparticle.qmlproject b/examples/quick/particles/customparticle/customparticle.qmlproject
index 6ea1849e31..6ea1849e31 100644
--- a/examples/particles/customparticle/customparticle.qmlproject
+++ b/examples/quick/particles/customparticle/customparticle.qmlproject
diff --git a/examples/quick/particles/customparticle/customparticle.qrc b/examples/quick/particles/customparticle/customparticle.qrc
new file mode 100644
index 0000000000..8a4e087a12
--- /dev/null
+++ b/examples/quick/particles/customparticle/customparticle.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/particles/customparticle">
+        <file>customparticle.qml</file>
+        <file>content/blurparticles.qml</file>
+        <file>content/fragmentshader.qml</file>
+        <file>content/imagecolors.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/particles/customparticle/doc/images/qml-customparticle-example.png b/examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png
index e23c6c8efc..e23c6c8efc 100644
--- a/examples/particles/customparticle/doc/images/qml-customparticle-example.png
+++ b/examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png
diff --git a/examples/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
index 411adf2470..39c3d7c101 100644
--- a/examples/particles/customparticle/doc/src/customparticle.qdoc
+++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
@@ -36,19 +36,19 @@
 
     Blur Particles adds a blur effect to the particles, which increases over the particle's life time.
     It uses a custom vertex shader:
-    \snippet examples/particles/customparticle/content/blurparticles.qml vertex
+    \snippet particles/customparticle/content/blurparticles.qml vertex
     to propagate life time simulation to a custom fragement shader:
-    \snippet examples/particles/customparticle/content/blurparticles.qml fragment
+    \snippet particles/customparticle/content/blurparticles.qml fragment
     which has access to both the normal image sampler and a blurred sampler, the image plus a ShaderEffect.
 
     Fragment Shader just uses the particle system as a vertex delivery system.
-    \snippet examples/particles/customparticle/content/fragmentshader.qml 0
+    \snippet particles/customparticle/content/fragmentshader.qml 0
 
     Image Colors uses CustomParticle to assign colors to particles based on their location in a picture.
     The vertex shader,
-    \snippet examples/particles/customparticle/content/imagecolors.qml vertex
+    \snippet particles/customparticle/content/imagecolors.qml vertex
     passes along the starting position for each vertex to the fragment shader,
-    \snippet examples/particles/customparticle/content/imagecolors.qml fragment
+    \snippet particles/customparticle/content/imagecolors.qml fragment
     which uses it to determine the color for that particle.
 
 */
diff --git a/examples/quick/particles/customparticle/main.cpp b/examples/quick/particles/customparticle/main.cpp
new file mode 100644
index 0000000000..c873710470
--- /dev/null
+++ b/examples/quick/particles/customparticle/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(particles/customparticle/customparticle)
diff --git a/examples/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml
index ae526aa5a3..ae526aa5a3 100644
--- a/examples/particles/emitters/content/burstandpulse.qml
+++ b/examples/quick/particles/emitters/content/burstandpulse.qml
diff --git a/examples/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml
index 40b04a56d5..40b04a56d5 100644
--- a/examples/particles/emitters/content/customemitter.qml
+++ b/examples/quick/particles/emitters/content/customemitter.qml
diff --git a/examples/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml
index 0ecaa61670..0ecaa61670 100644
--- a/examples/particles/emitters/content/emitmask.qml
+++ b/examples/quick/particles/emitters/content/emitmask.qml
diff --git a/examples/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml
index 25c608882b..25c608882b 100644
--- a/examples/particles/emitters/content/maximumemitted.qml
+++ b/examples/quick/particles/emitters/content/maximumemitted.qml
diff --git a/examples/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml
index 14307258ae..14307258ae 100644
--- a/examples/particles/emitters/content/shapeanddirection.qml
+++ b/examples/quick/particles/emitters/content/shapeanddirection.qml
diff --git a/examples/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml
index 0fab2e73ea..0fab2e73ea 100644
--- a/examples/particles/emitters/content/trailemitter.qml
+++ b/examples/quick/particles/emitters/content/trailemitter.qml
diff --git a/examples/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml
index ce8bfe11cd..ce8bfe11cd 100644
--- a/examples/particles/emitters/content/velocityfrommotion.qml
+++ b/examples/quick/particles/emitters/content/velocityfrommotion.qml
diff --git a/examples/particles/emitters/doc/images/qml-emitters-example.png b/examples/quick/particles/emitters/doc/images/qml-emitters-example.png
index 0025afd30c..0025afd30c 100644
--- a/examples/particles/emitters/doc/images/qml-emitters-example.png
+++ b/examples/quick/particles/emitters/doc/images/qml-emitters-example.png
diff --git a/examples/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc
index 0138a57c31..37da46f2df 100644
--- a/examples/particles/emitters/doc/src/emitters.qdoc
+++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc
@@ -34,27 +34,27 @@
     Each example is a small QML file emphasizing a particular element or feature.
 
     Velocity from motion gives the effect of strong particle motion through primarily moving the emitters:
-    \snippet examples/particles/emitters/content/velocityfrommotion.qml 0
+    \snippet particles/emitters/content/velocityfrommotion.qml 0
 
     Burst and pulse calls the burst and pulse methods on two idential emitters.
-    \snippet examples/particles/emitters/content/burstandpulse.qml 0
+    \snippet particles/emitters/content/burstandpulse.qml 0
     Note how burst takes an argument of number of particles to emit, and pulse takes an argument of number of milliseconds to emit for.
     This gives a slightly different behaviour, which is easy to see in this example.
 
     Custom Emitter connects to the emitParticles signal to set arbitrary values on particle data as they're emitted;
-    \snippet examples/particles/emitters/content/customemitter.qml 0
+    \snippet particles/emitters/content/customemitter.qml 0
     This is used to emit curving particles in six rotating spokes.
 
     Emit mask sets an image mask on the Emitter, to emit out of an arbitrary shape.
-    \snippet examples/particles/emitters/content/emitmask.qml 0
+    \snippet particles/emitters/content/emitmask.qml 0
 
     Maximum emitted emits no more than a certain number of particles at a time. This example makes it easy to see what happens when the limit is reached.
 
     Shape and Direction emits particles out of an unfilled Ellipse shape, using a TargetDirection
-    \snippet examples/particles/emitters/content/shapeanddirection.qml 0
+    \snippet particles/emitters/content/shapeanddirection.qml 0
     This sends the particles towards the center of the ellipse with proportional speed, keeping the ellipse outline as they move to the center.
 
     TrailEmitter uses that element to add smoke particles to trail the fire particles in the scene.
-    \snippet examples/particles/emitters/content/customemitter.qml 0
+    \snippet particles/emitters/content/customemitter.qml 0
 
 */
diff --git a/examples/quick/particles/emitters/emitters.pro b/examples/quick/particles/emitters/emitters.pro
new file mode 100644
index 0000000000..c5d8b8b0c9
--- /dev/null
+++ b/examples/quick/particles/emitters/emitters.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    emitters.qrc \
+    ../images.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters
+INSTALLS += target
diff --git a/examples/particles/emitters/emitters.qml b/examples/quick/particles/emitters/emitters.qml
index 060d01fe4c..060d01fe4c 100644
--- a/examples/particles/emitters/emitters.qml
+++ b/examples/quick/particles/emitters/emitters.qml
diff --git a/examples/particles/emitters/emitters.qmlproject b/examples/quick/particles/emitters/emitters.qmlproject
index 5379aac1dc..5379aac1dc 100644
--- a/examples/particles/emitters/emitters.qmlproject
+++ b/examples/quick/particles/emitters/emitters.qmlproject
diff --git a/examples/quick/particles/emitters/emitters.qrc b/examples/quick/particles/emitters/emitters.qrc
new file mode 100644
index 0000000000..708c8683f0
--- /dev/null
+++ b/examples/quick/particles/emitters/emitters.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/particles/emitters">
+        <file>emitters.qml</file>
+        <file>content/burstandpulse.qml</file>
+        <file>content/customemitter.qml</file>
+        <file>content/emitmask.qml</file>
+        <file>content/maximumemitted.qml</file>
+        <file>content/shapeanddirection.qml</file>
+        <file>content/trailemitter.qml</file>
+        <file>content/velocityfrommotion.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/particles/emitters/main.cpp b/examples/quick/particles/emitters/main.cpp
new file mode 100644
index 0000000000..579e0d0cb8
--- /dev/null
+++ b/examples/quick/particles/emitters/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(particles/emitters/emitters)
diff --git a/examples/particles/imageparticle/content/allatonce.qml b/examples/quick/particles/imageparticle/content/allatonce.qml
index 0e3e86c41f..0e3e86c41f 100644
--- a/examples/particles/imageparticle/content/allatonce.qml
+++ b/examples/quick/particles/imageparticle/content/allatonce.qml
diff --git a/examples/particles/imageparticle/content/colored.qml b/examples/quick/particles/imageparticle/content/colored.qml
index 9d72ca7412..9d72ca7412 100644
--- a/examples/particles/imageparticle/content/colored.qml
+++ b/examples/quick/particles/imageparticle/content/colored.qml
diff --git a/examples/particles/imageparticle/content/colortable.qml b/examples/quick/particles/imageparticle/content/colortable.qml
index 32fc30aa8d..32fc30aa8d 100644
--- a/examples/particles/imageparticle/content/colortable.qml
+++ b/examples/quick/particles/imageparticle/content/colortable.qml
diff --git a/examples/particles/imageparticle/content/deformation.qml b/examples/quick/particles/imageparticle/content/deformation.qml
index a7a3415165..a7a3415165 100644
--- a/examples/particles/imageparticle/content/deformation.qml
+++ b/examples/quick/particles/imageparticle/content/deformation.qml
diff --git a/examples/particles/imageparticle/content/rotation.qml b/examples/quick/particles/imageparticle/content/rotation.qml
index 2b1d828c7d..2b1d828c7d 100644
--- a/examples/particles/imageparticle/content/rotation.qml
+++ b/examples/quick/particles/imageparticle/content/rotation.qml
diff --git a/examples/particles/imageparticle/content/sharing.qml b/examples/quick/particles/imageparticle/content/sharing.qml
index 433ffe9524..433ffe9524 100644
--- a/examples/particles/imageparticle/content/sharing.qml
+++ b/examples/quick/particles/imageparticle/content/sharing.qml
diff --git a/examples/particles/imageparticle/content/sprites.qml b/examples/quick/particles/imageparticle/content/sprites.qml
index 0f74ab60f2..0f74ab60f2 100644
--- a/examples/particles/imageparticle/content/sprites.qml
+++ b/examples/quick/particles/imageparticle/content/sprites.qml
diff --git a/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png b/examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png
index 9e44abe4fb..9e44abe4fb 100644
--- a/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png
+++ b/examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png
diff --git a/examples/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
index c12de1def3..62c1a06839 100644
--- a/examples/particles/imageparticle/doc/src/imageparticle.qdoc
+++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
@@ -35,25 +35,25 @@
     Each example is a small QML file emphasizing a particular element or feature.
 
     All at once shows off several of the features of ImageParticle at the same time.
-    \snippet examples/particles/imageparticle/content/allatonce.qml 0
+    \snippet particles/imageparticle/content/allatonce.qml 0
 
     Colored shows a simple ImageParticle with some color variation.
-    \snippet examples/particles/imageparticle/content/colored.qml 0
+    \snippet particles/imageparticle/content/colored.qml 0
 
     Color Table sets the color over life on the particles to provide a fixed rainbow effect.
-    \snippet examples/particles/imageparticle/content/colortable.qml 0
+    \snippet particles/imageparticle/content/colortable.qml 0
 
     Deformation spins and squishes a starfish particle.
-    \snippet examples/particles/imageparticle/content/deformation.qml spin
-    \snippet examples/particles/imageparticle/content/deformation.qml deform
+    \snippet particles/imageparticle/content/deformation.qml spin
+    \snippet particles/imageparticle/content/deformation.qml deform
 
     Rotation demonstrates the autoRotate property, so that particles rotate in the direction that they travel.
 
     Sharing demonstrates what happens when multiple ImageParticles try to render the same particle.
     The following ImageParticle renders the particles inside the ListView:
-    \snippet examples/particles/imageparticle/content/sharing.qml 0
+    \snippet particles/imageparticle/content/sharing.qml 0
     The following ImageParticle is placed inside the list highlight, and renders the particles above the other ImageParticle.
-    \snippet examples/particles/imageparticle/content/sharing.qml 1
+    \snippet particles/imageparticle/content/sharing.qml 1
     Note that because it sets the color and alpha in this ImageParticle, it renders the particles in a different color.
     Since it doesn't specify anything about the rotation, it shares the rotation with the other ImageParticle so that the flowers are rotated the same way in both.
     Note that you can undo rotation in another ImageParticle, you just need to explicity set rotationVariation to 0.
diff --git a/examples/quick/particles/imageparticle/imageparticle.pro b/examples/quick/particles/imageparticle/imageparticle.pro
new file mode 100644
index 0000000000..e639c7423a
--- /dev/null
+++ b/examples/quick/particles/imageparticle/imageparticle.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    imageparticle.qrc \
+    ../images.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle
+INSTALLS += target
diff --git a/examples/particles/imageparticle/imageparticle.qml b/examples/quick/particles/imageparticle/imageparticle.qml
index 5f7ca38b13..5f7ca38b13 100644
--- a/examples/particles/imageparticle/imageparticle.qml
+++ b/examples/quick/particles/imageparticle/imageparticle.qml
diff --git a/examples/particles/imageparticle/imageparticle.qmlproject b/examples/quick/particles/imageparticle/imageparticle.qmlproject
index 902cf6519a..902cf6519a 100644
--- a/examples/particles/imageparticle/imageparticle.qmlproject
+++ b/examples/quick/particles/imageparticle/imageparticle.qmlproject
diff --git a/examples/quick/particles/imageparticle/imageparticle.qrc b/examples/quick/particles/imageparticle/imageparticle.qrc
new file mode 100644
index 0000000000..d9e4115e3e
--- /dev/null
+++ b/examples/quick/particles/imageparticle/imageparticle.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/particles/imageparticle">
+        <file>imageparticle.qml</file>
+        <file>content/allatonce.qml</file>
+        <file>content/colored.qml</file>
+        <file>content/colortable.qml</file>
+        <file>content/deformation.qml</file>
+        <file>content/rotation.qml</file>
+        <file>content/sharing.qml</file>
+        <file>content/sprites.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/particles/imageparticle/main.cpp b/examples/quick/particles/imageparticle/main.cpp
new file mode 100644
index 0000000000..576182ebe5
--- /dev/null
+++ b/examples/quick/particles/imageparticle/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(particles/imageparticle/imageparticle)
diff --git a/examples/quick/particles/images.qrc b/examples/quick/particles/images.qrc
new file mode 100644
index 0000000000..9f284a087d
--- /dev/null
+++ b/examples/quick/particles/images.qrc
@@ -0,0 +1,38 @@
+<RCC>
+    <qresource prefix="/particles">
+        <file>images/_explo.png</file>
+        <file>images/backgroundLeaves.jpg</file>
+        <file>images/bear_tiles.png</file>
+        <file>images/candle.png</file>
+        <file>images/colortable.png</file>
+        <file>images/finalfrontier.png</file>
+        <file>images/flower.png</file>
+        <file>images/matchmask.png</file>
+        <file>images/meteor_explo.png</file>
+        <file>images/meteor.png</file>
+        <file>images/meteors.png</file>
+        <file>images/nullRock.png</file>
+        <file>images/particle.png</file>
+        <file>images/particle2.png</file>
+        <file>images/particle3.png</file>
+        <file>images/particle4.png</file>
+        <file>images/particleA.png</file>
+        <file>images/portal_bg.png</file>
+        <file>images/realLeaf1.png</file>
+        <file>images/realLeaf2.png</file>
+        <file>images/realLeaf3.png</file>
+        <file>images/realLeaf4.png</file>
+        <file>images/rocket.png</file>
+        <file>images/rocket2.png</file>
+        <file>images/sizeInOut.png</file>
+        <file>images/snowflake.png</file>
+        <file>images/sparkleSize.png</file>
+        <file>images/star.png</file>
+        <file>images/starfish_0.png</file>
+        <file>images/starfish_1.png</file>
+        <file>images/starfish_2.png</file>
+        <file>images/starfish_3.png</file>
+        <file>images/starfish_4.png</file>
+        <file>images/starfish_mask.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/particles/images/_explo.png b/examples/quick/particles/images/_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/particles/images/_explo.png
+++ b/examples/quick/particles/images/_explo.png
diff --git a/examples/particles/images/backgroundLeaves.jpg b/examples/quick/particles/images/backgroundLeaves.jpg
index 08be16751d..08be16751d 100755
--- a/examples/particles/images/backgroundLeaves.jpg
+++ b/examples/quick/particles/images/backgroundLeaves.jpg
diff --git a/examples/particles/images/bear_tiles.png b/examples/quick/particles/images/bear_tiles.png
index 6bbb2a9b6d..6bbb2a9b6d 100644
--- a/examples/particles/images/bear_tiles.png
+++ b/examples/quick/particles/images/bear_tiles.png
diff --git a/examples/particles/images/candle.png b/examples/quick/particles/images/candle.png
index 8fa3193719..8fa3193719 100644
--- a/examples/particles/images/candle.png
+++ b/examples/quick/particles/images/candle.png
diff --git a/examples/particles/images/colortable.png b/examples/quick/particles/images/colortable.png
index a62ceeb4a0..a62ceeb4a0 100644
--- a/examples/particles/images/colortable.png
+++ b/examples/quick/particles/images/colortable.png
diff --git a/examples/particles/images/finalfrontier.png b/examples/quick/particles/images/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/particles/images/finalfrontier.png
+++ b/examples/quick/particles/images/finalfrontier.png
diff --git a/examples/particles/images/flower.png b/examples/quick/particles/images/flower.png
index b5c606210e..b5c606210e 100644
--- a/examples/particles/images/flower.png
+++ b/examples/quick/particles/images/flower.png
diff --git a/examples/particles/images/matchmask.png b/examples/quick/particles/images/matchmask.png
index e575875c55..e575875c55 100644
--- a/examples/particles/images/matchmask.png
+++ b/examples/quick/particles/images/matchmask.png
diff --git a/examples/particles/images/meteor.png b/examples/quick/particles/images/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/particles/images/meteor.png
+++ b/examples/quick/particles/images/meteor.png
diff --git a/examples/particles/images/meteor_explo.png b/examples/quick/particles/images/meteor_explo.png
index e659bfe2cf..e659bfe2cf 100644
--- a/examples/particles/images/meteor_explo.png
+++ b/examples/quick/particles/images/meteor_explo.png
diff --git a/examples/particles/images/meteors.png b/examples/quick/particles/images/meteors.png
index bada8a1407..bada8a1407 100644
--- a/examples/particles/images/meteors.png
+++ b/examples/quick/particles/images/meteors.png
diff --git a/examples/particles/images/nullRock.png b/examples/quick/particles/images/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/particles/images/nullRock.png
+++ b/examples/quick/particles/images/nullRock.png
diff --git a/examples/particles/images/particle.png b/examples/quick/particles/images/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/particles/images/particle.png
+++ b/examples/quick/particles/images/particle.png
diff --git a/examples/particles/images/particle2.png b/examples/quick/particles/images/particle2.png
index 36349c6c6e..36349c6c6e 100644
--- a/examples/particles/images/particle2.png
+++ b/examples/quick/particles/images/particle2.png
diff --git a/examples/particles/images/particle3.png b/examples/quick/particles/images/particle3.png
index 905d8f37b8..905d8f37b8 100644
--- a/examples/particles/images/particle3.png
+++ b/examples/quick/particles/images/particle3.png
diff --git a/examples/particles/images/particle4.png b/examples/quick/particles/images/particle4.png
index bc95b703c1..bc95b703c1 100644
--- a/examples/particles/images/particle4.png
+++ b/examples/quick/particles/images/particle4.png
diff --git a/examples/particles/images/particleA.png b/examples/quick/particles/images/particleA.png
index c63acdee1f..c63acdee1f 100644
--- a/examples/particles/images/particleA.png
+++ b/examples/quick/particles/images/particleA.png
diff --git a/examples/particles/images/portal_bg.png b/examples/quick/particles/images/portal_bg.png
index 3c59eeabb9..3c59eeabb9 100644
--- a/examples/particles/images/portal_bg.png
+++ b/examples/quick/particles/images/portal_bg.png
diff --git a/examples/particles/images/realLeaf1.png b/examples/quick/particles/images/realLeaf1.png
index 6cabf29efd..6cabf29efd 100644
--- a/examples/particles/images/realLeaf1.png
+++ b/examples/quick/particles/images/realLeaf1.png
diff --git a/examples/particles/images/realLeaf2.png b/examples/quick/particles/images/realLeaf2.png
index bfeca861d5..bfeca861d5 100644
--- a/examples/particles/images/realLeaf2.png
+++ b/examples/quick/particles/images/realLeaf2.png
diff --git a/examples/particles/images/realLeaf3.png b/examples/quick/particles/images/realLeaf3.png
index b1071e862b..b1071e862b 100644
--- a/examples/particles/images/realLeaf3.png
+++ b/examples/quick/particles/images/realLeaf3.png
diff --git a/examples/particles/images/realLeaf4.png b/examples/quick/particles/images/realLeaf4.png
index d61d53d10e..d61d53d10e 100644
--- a/examples/particles/images/realLeaf4.png
+++ b/examples/quick/particles/images/realLeaf4.png
diff --git a/examples/particles/images/rocket.png b/examples/quick/particles/images/rocket.png
index a171610b03..a171610b03 100644
--- a/examples/particles/images/rocket.png
+++ b/examples/quick/particles/images/rocket.png
diff --git a/examples/particles/images/rocket2.png b/examples/quick/particles/images/rocket2.png
index 7110f8fdc6..7110f8fdc6 100644
--- a/examples/particles/images/rocket2.png
+++ b/examples/quick/particles/images/rocket2.png
diff --git a/examples/particles/images/sizeInOut.png b/examples/quick/particles/images/sizeInOut.png
index 0a306ea21a..0a306ea21a 100644
--- a/examples/particles/images/sizeInOut.png
+++ b/examples/quick/particles/images/sizeInOut.png
diff --git a/examples/particles/images/snowflake.png b/examples/quick/particles/images/snowflake.png
index 490887a82f..490887a82f 100644
--- a/examples/particles/images/snowflake.png
+++ b/examples/quick/particles/images/snowflake.png
diff --git a/examples/particles/images/sparkleSize.png b/examples/quick/particles/images/sparkleSize.png
index 752056541b..752056541b 100644
--- a/examples/particles/images/sparkleSize.png
+++ b/examples/quick/particles/images/sparkleSize.png
diff --git a/examples/particles/images/star.png b/examples/quick/particles/images/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/particles/images/star.png
+++ b/examples/quick/particles/images/star.png
diff --git a/examples/particles/images/starfish_0.png b/examples/quick/particles/images/starfish_0.png
index 8747f0236e..8747f0236e 100644
--- a/examples/particles/images/starfish_0.png
+++ b/examples/quick/particles/images/starfish_0.png
diff --git a/examples/particles/images/starfish_1.png b/examples/quick/particles/images/starfish_1.png
index 1f3f159d5e..1f3f159d5e 100644
--- a/examples/particles/images/starfish_1.png
+++ b/examples/quick/particles/images/starfish_1.png
diff --git a/examples/particles/images/starfish_2.png b/examples/quick/particles/images/starfish_2.png
index c6c7e5a676..c6c7e5a676 100644
--- a/examples/particles/images/starfish_2.png
+++ b/examples/quick/particles/images/starfish_2.png
diff --git a/examples/particles/images/starfish_3.png b/examples/quick/particles/images/starfish_3.png
index 307a89f815..307a89f815 100644
--- a/examples/particles/images/starfish_3.png
+++ b/examples/quick/particles/images/starfish_3.png
diff --git a/examples/particles/images/starfish_4.png b/examples/quick/particles/images/starfish_4.png
index d61c26545a..d61c26545a 100644
--- a/examples/particles/images/starfish_4.png
+++ b/examples/quick/particles/images/starfish_4.png
diff --git a/examples/particles/images/starfish_mask.png b/examples/quick/particles/images/starfish_mask.png
index 2ef74f902b..2ef74f902b 100644
--- a/examples/particles/images/starfish_mask.png
+++ b/examples/quick/particles/images/starfish_mask.png
diff --git a/examples/particles/itemparticle/content/Delegate.qml b/examples/quick/particles/itemparticle/content/Delegate.qml
index d0292f2467..d0292f2467 100644
--- a/examples/particles/itemparticle/content/Delegate.qml
+++ b/examples/quick/particles/itemparticle/content/Delegate.qml
diff --git a/examples/particles/itemparticle/content/Delegate2.qml b/examples/quick/particles/itemparticle/content/Delegate2.qml
index 710c168612..710c168612 100644
--- a/examples/particles/itemparticle/content/Delegate2.qml
+++ b/examples/quick/particles/itemparticle/content/Delegate2.qml
diff --git a/examples/particles/itemparticle/content/ExpandingDelegate.qml b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml
index ee81873a7e..ee81873a7e 100644
--- a/examples/particles/itemparticle/content/ExpandingDelegate.qml
+++ b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml
diff --git a/examples/particles/itemparticle/content/RssModel.qml b/examples/quick/particles/itemparticle/content/RssModel.qml
index ed209a7ce5..ed209a7ce5 100644
--- a/examples/particles/itemparticle/content/RssModel.qml
+++ b/examples/quick/particles/itemparticle/content/RssModel.qml
diff --git a/examples/particles/itemparticle/content/bubble.png b/examples/quick/particles/itemparticle/content/bubble.png
index c7f479e9e3..c7f479e9e3 100644
--- a/examples/particles/itemparticle/content/bubble.png
+++ b/examples/quick/particles/itemparticle/content/bubble.png
diff --git a/examples/particles/itemparticle/content/script.js b/examples/quick/particles/itemparticle/content/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/particles/itemparticle/content/script.js
+++ b/examples/quick/particles/itemparticle/content/script.js
diff --git a/examples/particles/itemparticle/delegates.qml b/examples/quick/particles/itemparticle/delegates.qml
index fa076a2657..fa076a2657 100644
--- a/examples/particles/itemparticle/delegates.qml
+++ b/examples/quick/particles/itemparticle/delegates.qml
diff --git a/examples/particles/itemparticle/particleview.qml b/examples/quick/particles/itemparticle/particleview.qml
index 2501e6a713..2501e6a713 100644
--- a/examples/particles/itemparticle/particleview.qml
+++ b/examples/quick/particles/itemparticle/particleview.qml
diff --git a/examples/particles/particles.pro b/examples/quick/particles/particles.pro
index 5592f70ee3..9200113be8 100644
--- a/examples/particles/particles.pro
+++ b/examples/quick/particles/particles.pro
@@ -5,9 +5,10 @@ SUBDIRS += affectors \
     imageparticle \
     system
 
+EXAMPLE_FILES = \
+    itemparticle
+
 #Install shared images too
 qml.files = images
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles
-sources.files = particles.pro
-sources.path = $$qml.path
-INSTALLS = sources qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles
+INSTALLS += qml
diff --git a/examples/particles/system/content/dynamiccomparison.qml b/examples/quick/particles/system/content/dynamiccomparison.qml
index 82591a6f82..82591a6f82 100644
--- a/examples/particles/system/content/dynamiccomparison.qml
+++ b/examples/quick/particles/system/content/dynamiccomparison.qml
diff --git a/examples/particles/system/content/dynamicemitters.qml b/examples/quick/particles/system/content/dynamicemitters.qml
index bd4bcad397..bd4bcad397 100644
--- a/examples/particles/system/content/dynamicemitters.qml
+++ b/examples/quick/particles/system/content/dynamicemitters.qml
diff --git a/examples/particles/system/content/multiplepainters.qml b/examples/quick/particles/system/content/multiplepainters.qml
index 174f527f1f..174f527f1f 100644
--- a/examples/particles/system/content/multiplepainters.qml
+++ b/examples/quick/particles/system/content/multiplepainters.qml
diff --git a/examples/particles/system/content/startstop.qml b/examples/quick/particles/system/content/startstop.qml
index f0433e1b39..f0433e1b39 100644
--- a/examples/particles/system/content/startstop.qml
+++ b/examples/quick/particles/system/content/startstop.qml
diff --git a/examples/particles/system/content/timedgroupchanges.qml b/examples/quick/particles/system/content/timedgroupchanges.qml
index 86ea811614..86ea811614 100644
--- a/examples/particles/system/content/timedgroupchanges.qml
+++ b/examples/quick/particles/system/content/timedgroupchanges.qml
diff --git a/examples/particles/system/doc/images/qml-system-example.png b/examples/quick/particles/system/doc/images/qml-system-example.png
index 1a317c4be8..1a317c4be8 100644
--- a/examples/particles/system/doc/images/qml-system-example.png
+++ b/examples/quick/particles/system/doc/images/qml-system-example.png
diff --git a/examples/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc
index f0aee35676..8c381a57ec 100644
--- a/examples/particles/system/doc/src/system.qdoc
+++ b/examples/quick/particles/system/doc/src/system.qdoc
@@ -35,7 +35,7 @@
     Each example is a small QML file emphasizing a particular element or feature.
 
     Dynamic comparison compares using the particle system to getting a similar effect with the following code that dynamically instantiates Image elements.
-    \snippet examples/particles/system/content/dynamiccomparison.qml fake
+    \snippet particles/system/content/dynamiccomparison.qml fake
     Note how the Image elements are not able to be randomly colorized.
 
     Start and Stop simply sets the running and paused states of a ParticleSystem. While the system does not perform any simulation when stopped or paused, a restart restarts the simulation from the beginning, while unpausing resumes the simulation from where it was.
@@ -43,14 +43,14 @@
     Timed group changes is an example that highlights the ParticleGroup element. While normally referring to groups with a string name is sufficent, additional effects can be
     done by setting properties on groups.
     The first group has a variable duration on it, but always transitions to the second group.
-    \snippet examples/particles/system/content/timedgroupchanges.qml 0
+    \snippet particles/system/content/timedgroupchanges.qml 0
     The second group has a TrailEmitter on it, and a fixed duration for emitting into the third group. By placing the TrailEmitter as a direct child of the ParticleGroup, it automatically selects that group to follow.
-    \snippet examples/particles/system/content/timedgroupchanges.qml 1
+    \snippet particles/system/content/timedgroupchanges.qml 1
     The third group has an Affector as a direct child, which makes the affector automatically target this group. The affector means that as soon as particles enter this group, a burst function can be called on another emitter, using the x,y positions of this particle.
-    \snippet examples/particles/system/content/timedgroupchanges.qml 2
+    \snippet particles/system/content/timedgroupchanges.qml 2
 
     If TrailEmitter does not suit your needs for multiple emitters, you can also dynamically create Emitters while still using the same ParticleSystem and image particle
-    \snippet examples/particles/system/content/dynamicemitters.qml 0
+    \snippet particles/system/content/dynamicemitters.qml 0
     Note that this effect, a flurry of flying rainbow spears, would be better served with TrailEmitter. It is only done with dynamic emitters in this example to show the concept more simply.
 
     Multiple Painters shows how to control paint ordering of individual particles. While the paint ordering of particles within one ImagePainter is not strictly defined, ImageParticle elements follow the normal Z-ordering rules for QtQuick items. This example allow you to paint the inside of the particles above the black borders using a pair of ImageParticles each painting different parts of the same logical particle.
diff --git a/examples/quick/particles/system/main.cpp b/examples/quick/particles/system/main.cpp
new file mode 100644
index 0000000000..0bc840474c
--- /dev/null
+++ b/examples/quick/particles/system/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(particles/system/system)
diff --git a/examples/quick/particles/system/system.pro b/examples/quick/particles/system/system.pro
new file mode 100644
index 0000000000..df143f10a3
--- /dev/null
+++ b/examples/quick/particles/system/system.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    system.qrc \
+    ../images.qrc \
+    ../../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system
+INSTALLS += target
diff --git a/examples/particles/system/system.qml b/examples/quick/particles/system/system.qml
index a299d0af27..a299d0af27 100644
--- a/examples/particles/system/system.qml
+++ b/examples/quick/particles/system/system.qml
diff --git a/examples/particles/system/system.qmlproject b/examples/quick/particles/system/system.qmlproject
index 1f9df3cecf..1f9df3cecf 100644
--- a/examples/particles/system/system.qmlproject
+++ b/examples/quick/particles/system/system.qmlproject
diff --git a/examples/quick/particles/system/system.qrc b/examples/quick/particles/system/system.qrc
new file mode 100644
index 0000000000..3fb8221fb1
--- /dev/null
+++ b/examples/quick/particles/system/system.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/particles/system">
+        <file>system.qml</file>
+        <file>content/dynamiccomparison.qml</file>
+        <file>content/dynamicemitters.qml</file>
+        <file>content/multiplepainters.qml</file>
+        <file>content/startstop.qml</file>
+        <file>content/timedgroupchanges.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/positioners/main.cpp b/examples/quick/positioners/main.cpp
index d8941b1165..5554af68c6 100644
--- a/examples/quick/positioners/main.cpp
+++ b/examples/quick/positioners/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(positioners)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(positioners/positioners)
diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro
index e219cdea7a..a754d2a29a 100644
--- a/examples/quick/positioners/positioners.pro
+++ b/examples/quick/positioners/positioners.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    positioners.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
-qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
-sources.files = $$SOURCES positioners.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners
+INSTALLS += target
diff --git a/examples/quick/positioners/positioners.qml b/examples/quick/positioners/positioners.qml
index e02848dc16..b020e1be3b 100644
--- a/examples/quick/positioners/positioners.qml
+++ b/examples/quick/positioners/positioners.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/positioners/positioners.qrc b/examples/quick/positioners/positioners.qrc
new file mode 100644
index 0000000000..7025a6f8d8
--- /dev/null
+++ b/examples/quick/positioners/positioners.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/positioners">
+        <file>positioners.qml</file>
+        <file>positioners-attachedproperties.qml</file>
+        <file>positioners-transitions.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 2f0d430917..e3691a044b 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -5,7 +5,9 @@ SUBDIRS = accessibility \
             canvas \
             imageelements \
             keyinteraction \
-            modelviews \
+            localstorage \
+            models \
+            views \
             mousearea \
             positioners \
             righttoleft \
@@ -14,9 +16,13 @@ SUBDIRS = accessibility \
             text \
             threading \
             touchinteraction \
-            customitems
+            tutorials \
+            customitems \
+            imageprovider \
+            window \
+            particles \
+            demos
 
-# install
-sources.files = quick.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick
-INSTALLS += sources
+EXAMPLE_FILES = \
+    ui-components \
+    shared
diff --git a/examples/quick/righttoleft/main.cpp b/examples/quick/righttoleft/main.cpp
index 1fa9be963a..c008e2c85a 100644
--- a/examples/quick/righttoleft/main.cpp
+++ b/examples/quick/righttoleft/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(righttoleft)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(righttoleft/righttoleft)
diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro
index d22aa0f5ff..248564e07f 100644
--- a/examples/quick/righttoleft/righttoleft.pro
+++ b/examples/quick/righttoleft/righttoleft.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    righttoleft.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
-qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
-sources.files = $$SOURCES righttoleft.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft
+INSTALLS += target
diff --git a/examples/quick/righttoleft/righttoleft.qml b/examples/quick/righttoleft/righttoleft.qml
index 90f964ac75..7212d47514 100644
--- a/examples/quick/righttoleft/righttoleft.qml
+++ b/examples/quick/righttoleft/righttoleft.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/righttoleft/righttoleft.qrc b/examples/quick/righttoleft/righttoleft.qrc
new file mode 100644
index 0000000000..1d9f068a1e
--- /dev/null
+++ b/examples/quick/righttoleft/righttoleft.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/righttoleft">
+        <file>righttoleft.qml</file>
+        <file>layoutdirection/layoutdirection.qml</file>
+        <file>layoutmirroring/layoutmirroring.qml</file>
+        <file>textalignment/textalignment.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro
index 5198a3c44a..17c30fc560 100644
--- a/examples/quick/scenegraph/customgeometry/customgeometry.pro
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro
@@ -8,9 +8,7 @@ SOURCES += \
 HEADERS += \
     beziercurve.h
 
-OTHER_FILES += main.qml
+RESOURCES += customgeometry.qrc
 
-sources.files = $$SOURCES $$HEADERS $$OTHER_FILES customgeometry.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry
-target.path = $$sources.path
-INSTALLS += sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
+INSTALLS += target
diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.qrc b/examples/quick/scenegraph/customgeometry/customgeometry.qrc
new file mode 100644
index 0000000000..39080c5414
--- /dev/null
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/scenegraph/customgeometry">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
index c94574fb71..c226634823 100644
--- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
+++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
@@ -30,7 +30,7 @@
     \title Custom Geometry Example
     \ingroup examples
 
-    The custom geometry example shows how to create a QQuickItem which
+    \brief The custom geometry example shows how to create a QQuickItem which
     uses the scene graph API to build a custom geometry for the scene
     graph. It does this by creating a BezierCurve item which is made
     part of the CustomGeometry module and makes use of this in a QML
diff --git a/examples/quick/scenegraph/customgeometry/main.cpp b/examples/quick/scenegraph/customgeometry/main.cpp
index 6cb2b0e153..ea699c1c36 100644
--- a/examples/quick/scenegraph/customgeometry/main.cpp
+++ b/examples/quick/scenegraph/customgeometry/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
     qmlRegisterType<BezierCurve>("CustomGeometry", 1, 0, "BezierCurve");
 
     QQuickView view;
-    view.setSource(QUrl("main.qml"));
+    view.setSource(QUrl("qrc:///scenegraph/customgeometry/main.qml"));
     view.show();
 
     app.exec();
diff --git a/examples/quick/scenegraph/openglunderqml/main.cpp b/examples/quick/scenegraph/openglunderqml/main.cpp
index c5a68e83b1..adc389cb4c 100644
--- a/examples/quick/scenegraph/openglunderqml/main.cpp
+++ b/examples/quick/scenegraph/openglunderqml/main.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
     qmlRegisterType<Squircle>("OpenGLUnderQML", 1, 0, "Squircle");
 
     QQuickView view;
-    view.setSource(QUrl("main.qml"));
+    view.setSource(QUrl("qrc:///scenegraph/openglunderqml/main.qml"));
     view.show();
 
     return app.exec();
diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
index f2ad3d0d85..54558ce9e9 100644
--- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
+++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
@@ -2,10 +2,7 @@ QT += qml quick
 
 HEADERS += squircle.h
 SOURCES += squircle.cpp main.cpp
+RESOURCES += openglunderqml.qrc
 
-OTHER_FILES += main.qml
-
-sources.files = $$SOURCES $$HEADERS $$OTHER_FILES openglunderqml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/openglunderqml
-target.path = $$sources.path
-INSTALLS += sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml
+INSTALLS += target
diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc b/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc
new file mode 100644
index 0000000000..d166ea9d37
--- /dev/null
+++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/scenegraph/openglunderqml">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro
index 22506bcfeb..88b8d03dc3 100644
--- a/examples/quick/scenegraph/scenegraph.pro
+++ b/examples/quick/scenegraph/scenegraph.pro
@@ -1,7 +1,2 @@
 TEMPLATE = subdirs
 SUBDIRS += customgeometry simplematerial openglunderqml
-
-# install
-sources.files = scenegraph.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph
-INSTALLS += sources
diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.cpp b/examples/quick/scenegraph/simplematerial/simplematerial.cpp
index de5ae9ebda..b7bea08260 100644
--- a/examples/quick/scenegraph/simplematerial/simplematerial.cpp
+++ b/examples/quick/scenegraph/simplematerial/simplematerial.cpp
@@ -185,7 +185,7 @@ int main(int argc, char **argv)
     qmlRegisterType<Item>("SimpleMaterial", 1, 0, "SimpleMaterialItem");
 
     QQuickView view;
-    view.setSource(QUrl("main.qml"));
+    view.setSource(QUrl("qrc:///scenegraph/simplematerial/main.qml"));
     view.show();
 
     return app.exec();
diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro
index f8be76132e..6ae935f357 100644
--- a/examples/quick/scenegraph/simplematerial/simplematerial.pro
+++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro
@@ -3,11 +3,10 @@ QT += quick
 
 SOURCES += \
     simplematerial.cpp
+RESOURCES += simplematerial.qrc
 
-OTHER_FILES += \
-    main.qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial
+qml.files = main.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial
 
-sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial
-target.path = $$sources.path
-INSTALLS += sources target
+INSTALLS += target qml
diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.qrc b/examples/quick/scenegraph/simplematerial/simplematerial.qrc
new file mode 100644
index 0000000000..4cc1eaafe4
--- /dev/null
+++ b/examples/quick/scenegraph/simplematerial/simplematerial.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/scenegraph/simplematerial">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/shadereffects/main.cpp b/examples/quick/shadereffects/main.cpp
index 2cbce15465..c40c78099e 100644
--- a/examples/quick/shadereffects/main.cpp
+++ b/examples/quick/shadereffects/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(shadereffects)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(shadereffects/shadereffects)
diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro
index e85ccad38d..088b4a3f4f 100644
--- a/examples/quick/shadereffects/shadereffects.pro
+++ b/examples/quick/shadereffects/shadereffects.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += shadereffects.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
-qml.files = shadereffects.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
-sources.files = $$SOURCES shadereffects.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects
+INSTALLS += target
diff --git a/examples/quick/shadereffects/shadereffects.qrc b/examples/quick/shadereffects/shadereffects.qrc
new file mode 100644
index 0000000000..ff296a0155
--- /dev/null
+++ b/examples/quick/shadereffects/shadereffects.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/shadereffects">
+        <file>shadereffects.qml</file>
+        <file>content/face-smile.png</file>
+        <file>content/qt-logo.png</file>
+        <file>content/Slider.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/shared/Button.qml b/examples/quick/shared/Button.qml
index 9b2b5f39f4..9b2b5f39f4 100644
--- a/examples/shared/Button.qml
+++ b/examples/quick/shared/Button.qml
diff --git a/examples/shared/LauncherList.qml b/examples/quick/shared/LauncherList.qml
index 134fed1d8d..134fed1d8d 100644
--- a/examples/shared/LauncherList.qml
+++ b/examples/quick/shared/LauncherList.qml
diff --git a/examples/shared/README b/examples/quick/shared/README
index bf16f238c7..bf16f238c7 100644
--- a/examples/shared/README
+++ b/examples/quick/shared/README
diff --git a/examples/shared/SimpleLauncherDelegate.qml b/examples/quick/shared/SimpleLauncherDelegate.qml
index 6d647ac94f..6d647ac94f 100644
--- a/examples/shared/SimpleLauncherDelegate.qml
+++ b/examples/quick/shared/SimpleLauncherDelegate.qml
diff --git a/examples/shared/images/back.png b/examples/quick/shared/images/back.png
index 506ac42fcf..506ac42fcf 100644
--- a/examples/shared/images/back.png
+++ b/examples/quick/shared/images/back.png
diff --git a/examples/shared/qmldir b/examples/quick/shared/qmldir
index 2f1e56aefb..2f1e56aefb 100644
--- a/examples/shared/qmldir
+++ b/examples/quick/shared/qmldir
diff --git a/examples/quick/shared/quick_shared.qrc b/examples/quick/shared/quick_shared.qrc
new file mode 100644
index 0000000000..9fc114dc89
--- /dev/null
+++ b/examples/quick/shared/quick_shared.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/quick/shared">
+        <file>LauncherList.qml</file>
+        <file>SimpleLauncherDelegate.qml</file>
+        <file>Button.qml</file>
+        <file>images/back.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h
new file mode 100644
index 0000000000..a7072daa89
--- /dev/null
+++ b/examples/quick/shared/shared.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QDir>
+#include <QGuiApplication>
+#include <QQmlEngine>
+#include <QQuickView>
+#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
+{\
+    QGuiApplication app(argc,argv);\
+    QQuickView view;\
+    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\
+    view.setSource(QUrl("qrc:///" #NAME ".qml")); \
+    if (QGuiApplication::platformName() == QLatin1String("qnx") || \
+          QGuiApplication::platformName() == QLatin1String("eglfs")) {\
+        view.setResizeMode(QQuickView::SizeRootObjectToView);\
+        view.showFullScreen();\
+    } else {\
+        view.show();\
+    }\
+    return app.exec();\
+}
diff --git a/examples/quick/shared/shared.qrc b/examples/quick/shared/shared.qrc
new file mode 100644
index 0000000000..4ac856e66b
--- /dev/null
+++ b/examples/quick/shared/shared.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/shared">
+        <file>LauncherList.qml</file>
+        <file>SimpleLauncherDelegate.qml</file>
+        <file>Button.qml</file>
+        <file>images/back.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/text/main.cpp b/examples/quick/text/main.cpp
index 0e84b8de2f..b8f927d81e 100644
--- a/examples/quick/text/main.cpp
+++ b/examples/quick/text/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(text)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(text/text)
diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro
index b3734e29f3..733a99367b 100644
--- a/examples/quick/text/text.pro
+++ b/examples/quick/text/text.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    text.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
-qml.files = fonts imgtag styledtext-layout.qml text.qml textselection
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
-sources.files = $$SOURCES text.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/text
+INSTALLS += target
diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml
index 383e65e51c..b506fe53f8 100644
--- a/examples/quick/text/text.qml
+++ b/examples/quick/text/text.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/quick/text/text.qrc b/examples/quick/text/text.qrc
new file mode 100644
index 0000000000..f0d21627ad
--- /dev/null
+++ b/examples/quick/text/text.qrc
@@ -0,0 +1,24 @@
+<RCC>
+    <qresource prefix="/text">
+        <file>text.qml</file>
+        <file>fonts/availableFonts.qml</file>
+        <file>fonts/banner.qml</file>
+        <file>fonts/fonts.qml</file>
+        <file>fonts/hello.qml</file>
+        <file>fonts/content/fonts/tarzeau_ocr_a.ttf</file>
+        <file>imgtag/imgtag.qml</file>
+        <file>imgtag/images/face-sad.png</file>
+        <file>imgtag/images/face-smile-big.png</file>
+        <file>imgtag/images/face-smile.png</file>
+        <file>imgtag/images/heart200.png</file>
+        <file>imgtag/images/qtlogo.png</file>
+        <file>imgtag/images/starfish_2.png</file>
+        <file>textselection/textselection.qml</file>
+        <file>textselection/pics/endHandle.png</file>
+        <file>textselection/pics/endHandle.sci</file>
+        <file>textselection/pics/startHandle.png</file>
+        <file>textselection/pics/startHandle.sci</file>
+        <file>styledtext-layout.qml</file>
+        <file>imgtag/TextWithImage.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/threading/main.cpp b/examples/quick/threading/main.cpp
index 32399c988a..7e4e485529 100644
--- a/examples/quick/threading/main.cpp
+++ b/examples/quick/threading/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(threading)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(threading/threading)
diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro
index 303a13cbaf..cd9ed25e0c 100644
--- a/examples/quick/threading/threading.pro
+++ b/examples/quick/threading/threading.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    threading.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
-qml.files = threading.qml threadedlistmodel workerscript
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
-sources.files = $$SOURCES threading.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/threading
+INSTALLS += target
diff --git a/examples/quick/threading/threading.qml b/examples/quick/threading/threading.qml
index 5a79cd9fa6..011fdc0106 100644
--- a/examples/quick/threading/threading.qml
+++ b/examples/quick/threading/threading.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/threading/threading.qrc b/examples/quick/threading/threading.qrc
new file mode 100644
index 0000000000..6d15b7ef71
--- /dev/null
+++ b/examples/quick/threading/threading.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/threading">
+        <file>threading.qml</file>
+        <file>threadedlistmodel/timedisplay.qml</file>
+        <file>threadedlistmodel/dataloader.js</file>
+        <file>workerscript/Spinner.qml</file>
+        <file>workerscript/workerscript.js</file>
+        <file>workerscript/workerscript.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/touchinteraction/flickable/content/Panel.qml b/examples/quick/touchinteraction/flickable/content/Panel.qml
index 29189780a2..6932fca431 100644
--- a/examples/quick/touchinteraction/flickable/content/Panel.qml
+++ b/examples/quick/touchinteraction/flickable/content/Panel.qml
@@ -111,7 +111,7 @@ Component {
                             id: mouse
                             anchors.fill: parent
                             drag.target: stickyPage
-                            drag.axis: Drag.XandYAxis
+                            drag.axis: Drag.XAndYAxis
                             drag.minimumY: 0
                             drag.maximumY: page.height - 80
                             drag.minimumX: 100
diff --git a/examples/quick/touchinteraction/main.cpp b/examples/quick/touchinteraction/main.cpp
index 68215b5d89..6db041ef7d 100644
--- a/examples/quick/touchinteraction/main.cpp
+++ b/examples/quick/touchinteraction/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(touchinteraction)
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(touchinteraction/touchinteraction)
diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro
index 83919c4e8f..0ae0a41cce 100644
--- a/examples/quick/touchinteraction/touchinteraction.pro
+++ b/examples/quick/touchinteraction/touchinteraction.pro
@@ -2,10 +2,9 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
+RESOURCES += \
+    touchinteraction.qrc \
+    ../shared/shared.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
-qml.files = flickable multipointtouch pincharea touchinteraction.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
-sources.files = $$SOURCES touchinteraction.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction
+INSTALLS += target
diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml
index ab932e895f..c561714d50 100644
--- a/examples/quick/touchinteraction/touchinteraction.qml
+++ b/examples/quick/touchinteraction/touchinteraction.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/quick/touchinteraction/touchinteraction.qrc b/examples/quick/touchinteraction/touchinteraction.qrc
new file mode 100644
index 0000000000..6cec506a0f
--- /dev/null
+++ b/examples/quick/touchinteraction/touchinteraction.qrc
@@ -0,0 +1,27 @@
+<RCC>
+    <qresource prefix="/touchinteraction">
+        <file>touchinteraction.qml</file>
+        <file>flickable/basic-flickable.qml</file>
+        <file>flickable/corkboards.qml</file>
+        <file>flickable/content/cork.jpg</file>
+        <file>flickable/content/note-yellow.png</file>
+        <file>flickable/content/Panel.qml</file>
+        <file>flickable/content/tack.png</file>
+        <file>multipointtouch/bearwhack.qml</file>
+        <file>multipointtouch/multiflame.qml</file>
+        <file>multipointtouch/content/AugmentedTouchPoint.qml</file>
+        <file>multipointtouch/content/Bear0.png</file>
+        <file>multipointtouch/content/Bear1.png</file>
+        <file>multipointtouch/content/Bear2.png</file>
+        <file>multipointtouch/content/Bear3.png</file>
+        <file>multipointtouch/content/BearB.png</file>
+        <file>multipointtouch/content/BearWhackParticleSystem.qml</file>
+        <file>multipointtouch/content/blur-circle.png</file>
+        <file>multipointtouch/content/blur-circle3.png</file>
+        <file>multipointtouch/content/heart-blur.png</file>
+        <file>multipointtouch/content/ParticleFlame.qml</file>
+        <file>multipointtouch/content/title.png</file>
+        <file>pincharea/flickresize.qml</file>
+        <file>pincharea/qt-logo.jpg</file>
+    </qresource>
+</RCC>
diff --git a/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
index d0f52e16f2..d0f52e16f2 100644
--- a/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
index a3d4af5533..a3d4af5533 100644
--- a/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
diff --git a/examples/quick/modelviews/listview/content/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
index 22c7487fe1..22c7487fe1 100644
--- a/examples/quick/modelviews/listview/content/PetsModel.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
index 942505265c..942505265c 100644
--- a/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
diff --git a/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
index 22c7487fe1..22c7487fe1 100644
--- a/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
index 5c3da9499c..5c3da9499c 100644
--- a/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
diff --git a/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
index cfc8af216c..cfc8af216c 100644
--- a/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
diff --git a/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
index 22c7487fe1..22c7487fe1 100644
--- a/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
index 83f61a6e2f..83f61a6e2f 100644
--- a/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
diff --git a/examples/tutorials/extending/chapter1-basics/app.qml b/examples/quick/tutorials/extending/chapter1-basics/app.qml
index b5aabc9367..b5aabc9367 100644
--- a/examples/tutorials/extending/chapter1-basics/app.qml
+++ b/examples/quick/tutorials/extending/chapter1-basics/app.qml
diff --git a/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
index 8ed66f8b66..8ed66f8b66 100644
--- a/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
+++ b/examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
diff --git a/examples/tutorials/extending/chapter1-basics/main.cpp b/examples/quick/tutorials/extending/chapter1-basics/main.cpp
index 89c681185b..89c681185b 100644
--- a/examples/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/quick/tutorials/extending/chapter1-basics/main.cpp
diff --git a/examples/tutorials/extending/chapter1-basics/piechart.cpp b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
index eabc0a3ffc..eabc0a3ffc 100644
--- a/examples/tutorials/extending/chapter1-basics/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
diff --git a/examples/tutorials/extending/chapter1-basics/piechart.h b/examples/quick/tutorials/extending/chapter1-basics/piechart.h
index c86554942f..c86554942f 100644
--- a/examples/tutorials/extending/chapter1-basics/piechart.h
+++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.h
diff --git a/examples/tutorials/extending/chapter2-methods/app.qml b/examples/quick/tutorials/extending/chapter2-methods/app.qml
index dee65676ab..dee65676ab 100644
--- a/examples/tutorials/extending/chapter2-methods/app.qml
+++ b/examples/quick/tutorials/extending/chapter2-methods/app.qml
diff --git a/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro
index 8ed66f8b66..8ed66f8b66 100644
--- a/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro
+++ b/examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro
diff --git a/examples/tutorials/extending/chapter2-methods/main.cpp b/examples/quick/tutorials/extending/chapter2-methods/main.cpp
index 89c681185b..89c681185b 100644
--- a/examples/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/quick/tutorials/extending/chapter2-methods/main.cpp
diff --git a/examples/tutorials/extending/chapter2-methods/piechart.cpp b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
index 27b39d0df2..27b39d0df2 100644
--- a/examples/tutorials/extending/chapter2-methods/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
diff --git a/examples/tutorials/extending/chapter2-methods/piechart.h b/examples/quick/tutorials/extending/chapter2-methods/piechart.h
index 2655299f1a..2655299f1a 100644
--- a/examples/tutorials/extending/chapter2-methods/piechart.h
+++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.h
diff --git a/examples/tutorials/extending/chapter3-bindings/app.qml b/examples/quick/tutorials/extending/chapter3-bindings/app.qml
index 1267697ee7..1267697ee7 100644
--- a/examples/tutorials/extending/chapter3-bindings/app.qml
+++ b/examples/quick/tutorials/extending/chapter3-bindings/app.qml
diff --git a/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index 8ed66f8b66..8ed66f8b66 100644
--- a/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
+++ b/examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
diff --git a/examples/tutorials/extending/chapter3-bindings/main.cpp b/examples/quick/tutorials/extending/chapter3-bindings/main.cpp
index 89c681185b..89c681185b 100644
--- a/examples/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/quick/tutorials/extending/chapter3-bindings/main.cpp
diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
index ca7f0d701f..ca7f0d701f 100644
--- a/examples/tutorials/extending/chapter3-bindings/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.h b/examples/quick/tutorials/extending/chapter3-bindings/piechart.h
index 216a6012e9..216a6012e9 100644
--- a/examples/tutorials/extending/chapter3-bindings/piechart.h
+++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.h
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml
index b96cb554ac..b96cb554ac 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index 23eb222ea3..23eb222ea3 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index 367a252bf9..367a252bf9 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
index 9c907593f7..9c907593f7 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h
index 0259720091..0259720091 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
index b104e31c65..b104e31c65 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
index 5dbe3e53cf..5dbe3e53cf 100644
--- a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
diff --git a/examples/tutorials/extending/chapter5-listproperties/app.qml b/examples/quick/tutorials/extending/chapter5-listproperties/app.qml
index 4acd456131..4acd456131 100644
--- a/examples/tutorials/extending/chapter5-listproperties/app.qml
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/app.qml
diff --git a/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index 23eb222ea3..23eb222ea3 100644
--- a/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
diff --git a/examples/tutorials/extending/chapter5-listproperties/main.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/main.cpp
index 7af7dc8037..7af7dc8037 100644
--- a/examples/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/main.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
index 91e056a0cb..91e056a0cb 100644
--- a/examples/tutorials/extending/chapter5-listproperties/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.h b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.h
index 1234d07e6a..1234d07e6a 100644
--- a/examples/tutorials/extending/chapter5-listproperties/piechart.h
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.h
diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
index d2a927c01a..d2a927c01a 100644
--- a/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h
index e1fc76d445..e1fc76d445 100644
--- a/examples/tutorials/extending/chapter5-listproperties/pieslice.h
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h
diff --git a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir b/examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
index d9e8471b3c..d9e8471b3c 100644
--- a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir
+++ b/examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
diff --git a/examples/tutorials/extending/chapter6-plugins/app.qml b/examples/quick/tutorials/extending/chapter6-plugins/app.qml
index 19c39c9d2b..19c39c9d2b 100644
--- a/examples/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/quick/tutorials/extending/chapter6-plugins/app.qml
diff --git a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index c84b6fe7ff..6bf44b4d15 100644
--- a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml quick
 
 DESTDIR = Charts
diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp
index df079f767c..df079f767c 100644
--- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp
+++ b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h
index 09a120666b..09a120666b 100644
--- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
+++ b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h
diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
index 5110153acc..5110153acc 100644
--- a/examples/tutorials/extending/chapter6-plugins/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.h b/examples/quick/tutorials/extending/chapter6-plugins/piechart.h
index e292cdbc7a..e292cdbc7a 100644
--- a/examples/tutorials/extending/chapter6-plugins/piechart.h
+++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.h
diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
index d2a927c01a..d2a927c01a 100644
--- a/examples/tutorials/extending/chapter6-plugins/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.h b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.h
index 2ea15302fb..2ea15302fb 100644
--- a/examples/tutorials/extending/chapter6-plugins/pieslice.h
+++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.h
diff --git a/examples/tutorials/extending/extending.pro b/examples/quick/tutorials/extending/extending.pro
index 967473fda0..967473fda0 100644
--- a/examples/tutorials/extending/extending.pro
+++ b/examples/quick/tutorials/extending/extending.pro
diff --git a/examples/tutorials/gettingStartedQml/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/core/Button.qml
index a5afcc0297..a5afcc0297 100644
--- a/examples/tutorials/gettingStartedQml/core/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml
index 2665442685..2665442685 100644
--- a/examples/tutorials/gettingStartedQml/core/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml
index 24501efd89..24501efd89 100644
--- a/examples/tutorials/gettingStartedQml/core/FileDialog.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml
diff --git a/examples/tutorials/gettingStartedQml/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml
index 37afca62b9..37afca62b9 100644
--- a/examples/tutorials/gettingStartedQml/core/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
index 045e00e6c0..045e00e6c0 100644
--- a/examples/tutorials/gettingStartedQml/core/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/core/TextArea.qml
index 5165533f65..5165533f65 100644
--- a/examples/tutorials/gettingStartedQml/core/TextArea.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/core/qmldir b/examples/quick/tutorials/gettingStartedQml/core/qmldir
index da1f373433..da1f373433 100644
--- a/examples/tutorials/gettingStartedQml/core/qmldir
+++ b/examples/quick/tutorials/gettingStartedQml/core/qmldir
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
index a77b93ae33..a77b93ae33 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
index 05e076839a..05e076839a 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp
index 38a47f0431..38a47f0431 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.h
index 90c427c1c5..90c427c1c5 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/directory.h
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp
index b53c569d56..b53c569d56 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/file.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/filedialog/file.h
index 7a0da05b70..7a0da05b70 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/file.h
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/file.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
index 36ae0fc7f4..da06975e3b 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR +=  ../plugins
@@ -16,7 +16,7 @@ SOURCES +=    directory.cpp \
         file.cpp \
         dialogPlugin.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml/filedialog
-sources.files = $$SOURCES $$HEADERS filedialog.pro
-sources.path = $$target.path
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog
+qml.files = qmldir
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog
+INSTALLS += target qml
diff --git a/examples/tutorials/gettingStartedQml/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/filedialog/qmldir
index 4a8d13d026..4a8d13d026 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/qmldir
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/qmldir
diff --git a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro
new file mode 100644
index 0000000000..1fc74b69f3
--- /dev/null
+++ b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = subdirs
+SUBDIRS       = \
+                filedialog\
+
+EXAMPLE_FILES = \
+    core \
+    images \
+    parts \
+    pics \
+    texteditor.qml
diff --git a/examples/tutorials/gettingStartedQml/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/tutorials/gettingStartedQml/images/arrow.png
+++ b/examples/quick/tutorials/gettingStartedQml/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml
index f49ca9359f..f49ca9359f 100644
--- a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml
index ab85963593..ab85963593 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
index 1940aebac3..1940aebac3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
index abb7fba41b..abb7fba41b 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
index 7559d4a917..7559d4a917 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
index aab64bcf39..aab64bcf39 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
index d3ff66f2fd..d3ff66f2fd 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
index f2e2b0d990..f2e2b0d990 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
index 21ce50929b..21ce50929b 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml
index 7119feeb08..7119feeb08 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
index 47a37059b0..47a37059b0 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
index 41c7369fc0..41c7369fc0 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
index f9a293361e..f9a293361e 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png b/examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
index da959a3468..da959a3468 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml
index 7119feeb08..7119feeb08 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
index 47a37059b0..47a37059b0 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
index 41c7369fc0..41c7369fc0 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
index f9a293361e..f9a293361e 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml
index fa79c71fd9..fa79c71fd9 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
index 49be5e84cd..49be5e84cd 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
index d0623b5a79..d0623b5a79 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml
index 50d4c9059f..50d4c9059f 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
index 9613e3aaf5..9613e3aaf5 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
index fd3ccbd710..fd3ccbd710 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
index abd8a313cf..abd8a313cf 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
index 27f6923c1d..27f6923c1d 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml
index 88a60d049c..88a60d049c 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
index 09bcb37cb2..09bcb37cb2 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
index a195fb87c3..a195fb87c3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
index 5ce5a89ceb..5ce5a89ceb 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml
index eca367e859..eca367e859 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
index 57e297c509..57e297c509 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
index b73e908464..b73e908464 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
index c13e753f06..c13e753f06 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
index 89f21c021d..89f21c021d 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
index a19e53264d..a19e53264d 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir
index b8b0c7c431..b8b0c7c431 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/core/qmldir
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
index d71e622b33..d71e622b33 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
index 82035193c8..82035193c8 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
index 4cd9d2da85..4cd9d2da85 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
index 25b121d5b3..25b121d5b3 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
index 162350eb0f..162350eb0f 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
index 7125a9aae5..7125a9aae5 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
index 71abddc7e3..b3659d2b58 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR +=  ../plugins
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
index 4a8d13d026..4a8d13d026 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
index 27feed5e82..27feed5e82 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
index 4d8f9f22b2..4d8f9f22b2 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
index 680acfe839..680acfe839 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
index 27feed5e82..27feed5e82 100644
--- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
index 4d8f9f22b2..4d8f9f22b2 100644
--- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
+++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
index 680acfe839..680acfe839 100644
--- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
+++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
diff --git a/examples/tutorials/gettingStartedQml/texteditor.qml b/examples/quick/tutorials/gettingStartedQml/texteditor.qml
index 8e09b7fcf9..8e09b7fcf9 100644
--- a/examples/tutorials/gettingStartedQml/texteditor.qml
+++ b/examples/quick/tutorials/gettingStartedQml/texteditor.qml
diff --git a/examples/tutorials/helloworld/Cell.qml b/examples/quick/tutorials/helloworld/Cell.qml
index 760c468eaa..760c468eaa 100644
--- a/examples/tutorials/helloworld/Cell.qml
+++ b/examples/quick/tutorials/helloworld/Cell.qml
diff --git a/examples/tutorials/helloworld/tutorial1.qml b/examples/quick/tutorials/helloworld/tutorial1.qml
index f55a5d50cd..f55a5d50cd 100644
--- a/examples/tutorials/helloworld/tutorial1.qml
+++ b/examples/quick/tutorials/helloworld/tutorial1.qml
diff --git a/examples/tutorials/helloworld/tutorial2.qml b/examples/quick/tutorials/helloworld/tutorial2.qml
index fbcae467c3..fbcae467c3 100644
--- a/examples/tutorials/helloworld/tutorial2.qml
+++ b/examples/quick/tutorials/helloworld/tutorial2.qml
diff --git a/examples/tutorials/helloworld/tutorial3.qml b/examples/quick/tutorials/helloworld/tutorial3.qml
index 9b95e012a9..9b95e012a9 100644
--- a/examples/tutorials/helloworld/tutorial3.qml
+++ b/examples/quick/tutorials/helloworld/tutorial3.qml
diff --git a/examples/tutorials/samegame/samegame1/Block.qml b/examples/quick/tutorials/samegame/samegame1/Block.qml
index 65cff95dbe..65cff95dbe 100644
--- a/examples/tutorials/samegame/samegame1/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame1/Block.qml
diff --git a/examples/tutorials/samegame/samegame1/Button.qml b/examples/quick/tutorials/samegame/samegame1/Button.qml
index 6fdc6c707f..6fdc6c707f 100644
--- a/examples/tutorials/samegame/samegame1/Button.qml
+++ b/examples/quick/tutorials/samegame/samegame1/Button.qml
diff --git a/examples/tutorials/samegame/samegame1/samegame.qml b/examples/quick/tutorials/samegame/samegame1/samegame.qml
index ab3aca19a2..ab3aca19a2 100644
--- a/examples/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame1/samegame.qml
diff --git a/examples/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/tutorials/samegame/samegame1/samegame1.qmlproject
+++ b/examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject
diff --git a/examples/tutorials/samegame/samegame2/Block.qml b/examples/quick/tutorials/samegame/samegame2/Block.qml
index f4065565b6..f4065565b6 100644
--- a/examples/tutorials/samegame/samegame2/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame2/Block.qml
diff --git a/examples/tutorials/samegame/samegame2/Button.qml b/examples/quick/tutorials/samegame/samegame2/Button.qml
index db1b52e2cd..db1b52e2cd 100644
--- a/examples/tutorials/samegame/samegame2/Button.qml
+++ b/examples/quick/tutorials/samegame/samegame2/Button.qml
diff --git a/examples/tutorials/samegame/samegame2/samegame.js b/examples/quick/tutorials/samegame/samegame2/samegame.js
index c749dc17b1..c749dc17b1 100644
--- a/examples/tutorials/samegame/samegame2/samegame.js
+++ b/examples/quick/tutorials/samegame/samegame2/samegame.js
diff --git a/examples/tutorials/samegame/samegame2/samegame.qml b/examples/quick/tutorials/samegame/samegame2/samegame.qml
index 85f5f39b0c..85f5f39b0c 100644
--- a/examples/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame2/samegame.qml
diff --git a/examples/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/tutorials/samegame/samegame2/samegame2.qmlproject
+++ b/examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject
diff --git a/examples/tutorials/samegame/samegame3/Block.qml b/examples/quick/tutorials/samegame/samegame3/Block.qml
index 55fe7f876a..55fe7f876a 100644
--- a/examples/tutorials/samegame/samegame3/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame3/Block.qml
diff --git a/examples/tutorials/samegame/samegame3/Button.qml b/examples/quick/tutorials/samegame/samegame3/Button.qml
index db1b52e2cd..db1b52e2cd 100644
--- a/examples/tutorials/samegame/samegame3/Button.qml
+++ b/examples/quick/tutorials/samegame/samegame3/Button.qml
diff --git a/examples/tutorials/samegame/samegame3/Dialog.qml b/examples/quick/tutorials/samegame/samegame3/Dialog.qml
index f89ad16ba1..f89ad16ba1 100644
--- a/examples/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/quick/tutorials/samegame/samegame3/Dialog.qml
diff --git a/examples/tutorials/samegame/samegame3/samegame.js b/examples/quick/tutorials/samegame/samegame3/samegame.js
index df5bdfb049..df5bdfb049 100644
--- a/examples/tutorials/samegame/samegame3/samegame.js
+++ b/examples/quick/tutorials/samegame/samegame3/samegame.js
diff --git a/examples/tutorials/samegame/samegame3/samegame.qml b/examples/quick/tutorials/samegame/samegame3/samegame.qml
index 26d0212250..26d0212250 100644
--- a/examples/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame3/samegame.qml
diff --git a/examples/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/tutorials/samegame/samegame3/samegame3.qmlproject
+++ b/examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject
diff --git a/examples/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
index 335f4aecf6..5b9928e018 100644
--- a/examples/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.labs.particles 1.0
+import QtQuick.Particles 2.0
 
 Item {
     id: block
@@ -81,23 +81,30 @@ Item {
     //![2]
 
     //![3]
-    Particles {
-        id: particles
-
-        width: 1; height: 1
+    ParticleSystem {
+        id: sys
         anchors.centerIn: parent
+        ImageParticle {
+            // ![0]
+            source: {
+                if (type == 0)
+                    return "../../shared/pics/redStar.png";
+                else if (type == 1)
+                    return "../../shared/pics/blueStar.png";
+                else
+                    return "../../shared/pics/greenStar.png";
+            }
+            rotationVelocityVariation: 360
+            // ![0]
+        }
 
-        emissionRate: 0
-        lifeSpan: 700; lifeSpanDeviation: 600
-        angle: 0; angleDeviation: 360;
-        velocity: 100; velocityDeviation: 30
-        source: {
-            if (type == 0)
-                return "../../shared/pics/redStar.png";
-            else if (type == 1) 
-                return "../../shared/pics/blueStar.png";
-            else
-                return "../../shared/pics/greenStar.png";
+        Emitter {
+            id: particles
+            anchors.centerIn: parent
+            emitRate: 0
+            lifeSpan: 700
+            velocity: AngleDirection {angleVariation: 360; magnitude: 80; magnitudeVariation: 40}
+            size: 16
         }
     }
     //![3]
diff --git a/examples/tutorials/samegame/samegame4/content/Button.qml b/examples/quick/tutorials/samegame/samegame4/content/Button.qml
index db1b52e2cd..db1b52e2cd 100644
--- a/examples/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/quick/tutorials/samegame/samegame4/content/Button.qml
diff --git a/examples/tutorials/samegame/samegame4/content/Dialog.qml b/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml
index ca4d573543..ca4d573543 100644
--- a/examples/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml
diff --git a/examples/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/content/samegame.js
index ad4d39d7b1..7f1c976480 100755
--- a/examples/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/quick/tutorials/samegame/samegame4/content/samegame.js
@@ -1,5 +1,6 @@
 /* This script file handles the game logic */
 .import QtQuick.LocalStorage 2.0 as Sql
+.import QtQuick 2.0 as Quick
 
 var maxColumn = 10;
 var maxRow = 15;
@@ -45,12 +46,12 @@ function startNewGame() {
 
 function createBlock(column, row) {
     if (component == null)
-        component = Qt.createComponent("content/BoomBlock.qml");
+        component = Qt.createComponent("BoomBlock.qml");
 
     // Note that if Block.qml was not a local file, component.status would be
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
-    if (component.status == Component.Ready) {
+    if (component.status == Quick.Component.Ready) {
         var dynamicObject = component.createObject(gameCanvas);
         if (dynamicObject == null) {
             console.log("error creating block");
diff --git a/examples/tutorials/samegame/samegame4/highscores/README b/examples/quick/tutorials/samegame/samegame4/highscores/README
index eaa00fae37..eaa00fae37 100644
--- a/examples/tutorials/samegame/samegame4/highscores/README
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/README
diff --git a/examples/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
index c3fd90d9cf..c3fd90d9cf 100755
--- a/examples/tutorials/samegame/samegame4/highscores/score_data.xml
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
diff --git a/examples/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
index 670354c965..670354c965 100755
--- a/examples/tutorials/samegame/samegame4/highscores/score_style.xsl
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
diff --git a/examples/tutorials/samegame/samegame4/highscores/scores.php b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php
index daf480e21b..daf480e21b 100755
--- a/examples/tutorials/samegame/samegame4/highscores/scores.php
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php
diff --git a/examples/tutorials/samegame/samegame4/samegame.qml b/examples/quick/tutorials/samegame/samegame4/samegame.qml
index e6edcc35b8..e6edcc35b8 100644
--- a/examples/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame4/samegame.qml
diff --git a/examples/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/tutorials/samegame/samegame4/samegame4.qmlproject
+++ b/examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject
diff --git a/examples/tutorials/samegame/shared/pics/background.jpg b/examples/quick/tutorials/samegame/shared/pics/background.jpg
index 903d395c8d..903d395c8d 100644
--- a/examples/tutorials/samegame/shared/pics/background.jpg
+++ b/examples/quick/tutorials/samegame/shared/pics/background.jpg
diff --git a/examples/tutorials/samegame/shared/pics/blueStar.png b/examples/quick/tutorials/samegame/shared/pics/blueStar.png
index ff9588f80a..ff9588f80a 100644
--- a/examples/tutorials/samegame/shared/pics/blueStar.png
+++ b/examples/quick/tutorials/samegame/shared/pics/blueStar.png
diff --git a/examples/tutorials/samegame/shared/pics/blueStone.png b/examples/quick/tutorials/samegame/shared/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/tutorials/samegame/shared/pics/blueStone.png
+++ b/examples/quick/tutorials/samegame/shared/pics/blueStone.png
diff --git a/examples/tutorials/samegame/shared/pics/greenStar.png b/examples/quick/tutorials/samegame/shared/pics/greenStar.png
index cd06854719..cd06854719 100644
--- a/examples/tutorials/samegame/shared/pics/greenStar.png
+++ b/examples/quick/tutorials/samegame/shared/pics/greenStar.png
diff --git a/examples/tutorials/samegame/shared/pics/greenStone.png b/examples/quick/tutorials/samegame/shared/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/tutorials/samegame/shared/pics/greenStone.png
+++ b/examples/quick/tutorials/samegame/shared/pics/greenStone.png
diff --git a/examples/tutorials/samegame/shared/pics/redStar.png b/examples/quick/tutorials/samegame/shared/pics/redStar.png
index 0a4dffe583..0a4dffe583 100644
--- a/examples/tutorials/samegame/shared/pics/redStar.png
+++ b/examples/quick/tutorials/samegame/shared/pics/redStar.png
diff --git a/examples/tutorials/samegame/shared/pics/redStone.png b/examples/quick/tutorials/samegame/shared/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/tutorials/samegame/shared/pics/redStone.png
+++ b/examples/quick/tutorials/samegame/shared/pics/redStone.png
diff --git a/examples/tutorials/samegame/shared/pics/star.png b/examples/quick/tutorials/samegame/shared/pics/star.png
index defbde53ca..defbde53ca 100644
--- a/examples/tutorials/samegame/shared/pics/star.png
+++ b/examples/quick/tutorials/samegame/shared/pics/star.png
diff --git a/examples/tutorials/samegame/shared/pics/yellowStone.png b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/tutorials/samegame/shared/pics/yellowStone.png
+++ b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png
diff --git a/examples/quick/tutorials/tutorials.pro b/examples/quick/tutorials/tutorials.pro
new file mode 100644
index 0000000000..fd6117b2d0
--- /dev/null
+++ b/examples/quick/tutorials/tutorials.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+SUBDIRS += gettingStartedQml
+
+EXAMPLE_FILES = \
+    dynamicview \
+    extending \
+    helloworld \
+    samegame
diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
index c694e9ad63..4e302e7256 100644
--- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
+++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
@@ -34,7 +34,7 @@
 
 This example shows how to create a reusable switch component in QML.
 
-The code for this example can be found in the \c examples/tutorials/ui-components/slideswitch directory.
+The code for this example can be found in the \c examples/quick/tutorials/ui-components/slideswitch directory.
 
 The elements that compose the switch are:
 
diff --git a/examples/quick/modelviews/doc/images/qml-modelviews-example.png b/examples/quick/views/doc/images/qml-modelviews-example.png
index b40334653d..b40334653d 100644
--- a/examples/quick/modelviews/doc/images/qml-modelviews-example.png
+++ b/examples/quick/views/doc/images/qml-modelviews-example.png
diff --git a/examples/quick/modelviews/doc/src/modelviews.qdoc b/examples/quick/views/doc/src/views.qdoc
index 8743b45643..fe135db0d7 100644
--- a/examples/quick/modelviews/doc/src/modelviews.qdoc
+++ b/examples/quick/views/doc/src/views.qdoc
@@ -26,13 +26,13 @@
 ****************************************************************************/
 
 /*!
-    \title QtQuick Examples - ModelViews
-    \example quick/modelviews
+    \title QtQuick Examples - Views
+    \example quick/views
     \brief This is a collection of QML model/view examples
     \image qml-modelviews-example.png
     \ingroup qtquickexamples
 
-    This is a collection of small QML examples relating to model and view functionality.
+    This is a collection of small QML examples relating to model and view functionality. They demonstrate how to show data from a model using the QtQuick view types.
 
     \section2 GridView and PathView demonstrate usage of these elements to display views.
     \snippet quick/modelviews/gridview/gridview-example.qml 0
@@ -54,7 +54,7 @@
     \snippet quick/modelviews/listview/expandingdelegates.qml 3
 
     \section2 Highlight demonstrates adding a custom highlight to a ListView.
-    \snippet examples/quick/modelviews/listview/highlight.qml 0
+    \snippet quick/modelviews/listview/highlight.qml 0
 
     \section2 Highlight Ranges shows the three different highlight range modes of ListView.
     \snippet quick/modelviews/listview/highlightranges.qml 0
diff --git a/examples/quick/modelviews/gridview/gridview-example.qml b/examples/quick/views/gridview/gridview-example.qml
index 49d1174bee..49d1174bee 100644
--- a/examples/quick/modelviews/gridview/gridview-example.qml
+++ b/examples/quick/views/gridview/gridview-example.qml
diff --git a/examples/quick/modelviews/gridview/pics/AddressBook_48.png b/examples/quick/views/gridview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/quick/modelviews/gridview/pics/AddressBook_48.png
+++ b/examples/quick/views/gridview/pics/AddressBook_48.png
diff --git a/examples/quick/modelviews/gridview/pics/AudioPlayer_48.png b/examples/quick/views/gridview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/quick/modelviews/gridview/pics/AudioPlayer_48.png
+++ b/examples/quick/views/gridview/pics/AudioPlayer_48.png
diff --git a/examples/quick/modelviews/gridview/pics/Camera_48.png b/examples/quick/views/gridview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/quick/modelviews/gridview/pics/Camera_48.png
+++ b/examples/quick/views/gridview/pics/Camera_48.png
diff --git a/examples/quick/modelviews/gridview/pics/DateBook_48.png b/examples/quick/views/gridview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/quick/modelviews/gridview/pics/DateBook_48.png
+++ b/examples/quick/views/gridview/pics/DateBook_48.png
diff --git a/examples/quick/modelviews/gridview/pics/EMail_48.png b/examples/quick/views/gridview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/quick/modelviews/gridview/pics/EMail_48.png
+++ b/examples/quick/views/gridview/pics/EMail_48.png
diff --git a/examples/quick/modelviews/gridview/pics/TodoList_48.png b/examples/quick/views/gridview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/quick/modelviews/gridview/pics/TodoList_48.png
+++ b/examples/quick/views/gridview/pics/TodoList_48.png
diff --git a/examples/quick/modelviews/gridview/pics/VideoPlayer_48.png b/examples/quick/views/gridview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/quick/modelviews/gridview/pics/VideoPlayer_48.png
+++ b/examples/quick/views/gridview/pics/VideoPlayer_48.png
diff --git a/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/quick/views/listview/content/PetsModel.qml
index 22c7487fe1..22c7487fe1 100644
--- a/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml
+++ b/examples/quick/views/listview/content/PetsModel.qml
diff --git a/examples/quick/modelviews/listview/content/PressAndHoldButton.qml b/examples/quick/views/listview/content/PressAndHoldButton.qml
index 3b0883d5e1..3b0883d5e1 100644
--- a/examples/quick/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/quick/views/listview/content/PressAndHoldButton.qml
diff --git a/examples/quick/modelviews/listview/content/RecipesModel.qml b/examples/quick/views/listview/content/RecipesModel.qml
index e98bff990e..e98bff990e 100644
--- a/examples/quick/modelviews/listview/content/RecipesModel.qml
+++ b/examples/quick/views/listview/content/RecipesModel.qml
diff --git a/examples/quick/modelviews/listview/content/SmallText.qml b/examples/quick/views/listview/content/SmallText.qml
index 506e66bba9..506e66bba9 100644
--- a/examples/quick/modelviews/listview/content/SmallText.qml
+++ b/examples/quick/views/listview/content/SmallText.qml
diff --git a/examples/quick/modelviews/listview/content/TextButton.qml b/examples/quick/views/listview/content/TextButton.qml
index 3b016dcc16..3b016dcc16 100644
--- a/examples/quick/modelviews/listview/content/TextButton.qml
+++ b/examples/quick/views/listview/content/TextButton.qml
diff --git a/examples/quick/modelviews/listview/content/ToggleButton.qml b/examples/quick/views/listview/content/ToggleButton.qml
index 86a5d15d1a..86a5d15d1a 100644
--- a/examples/quick/modelviews/listview/content/ToggleButton.qml
+++ b/examples/quick/views/listview/content/ToggleButton.qml
diff --git a/examples/quick/modelviews/listview/content/pics/arrow-down.png b/examples/quick/views/listview/content/pics/arrow-down.png
index 29d1d4439a..29d1d4439a 100644
--- a/examples/quick/modelviews/listview/content/pics/arrow-down.png
+++ b/examples/quick/views/listview/content/pics/arrow-down.png
diff --git a/examples/quick/modelviews/listview/content/pics/arrow-up.png b/examples/quick/views/listview/content/pics/arrow-up.png
index e437312217..e437312217 100644
--- a/examples/quick/modelviews/listview/content/pics/arrow-up.png
+++ b/examples/quick/views/listview/content/pics/arrow-up.png
diff --git a/examples/quick/modelviews/listview/content/pics/fruit-salad.jpg b/examples/quick/views/listview/content/pics/fruit-salad.jpg
index da5a6b10a2..da5a6b10a2 100644
--- a/examples/quick/modelviews/listview/content/pics/fruit-salad.jpg
+++ b/examples/quick/views/listview/content/pics/fruit-salad.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/hamburger.jpg b/examples/quick/views/listview/content/pics/hamburger.jpg
index d0a15be1bf..d0a15be1bf 100644
--- a/examples/quick/modelviews/listview/content/pics/hamburger.jpg
+++ b/examples/quick/views/listview/content/pics/hamburger.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/lemonade.jpg b/examples/quick/views/listview/content/pics/lemonade.jpg
index db445c9ac8..db445c9ac8 100644
--- a/examples/quick/modelviews/listview/content/pics/lemonade.jpg
+++ b/examples/quick/views/listview/content/pics/lemonade.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/list-delete.png b/examples/quick/views/listview/content/pics/list-delete.png
index df2a147d24..df2a147d24 100644
--- a/examples/quick/modelviews/listview/content/pics/list-delete.png
+++ b/examples/quick/views/listview/content/pics/list-delete.png
diff --git a/examples/quick/modelviews/listview/content/pics/minus-sign.png b/examples/quick/views/listview/content/pics/minus-sign.png
index d6f233d739..d6f233d739 100644
--- a/examples/quick/modelviews/listview/content/pics/minus-sign.png
+++ b/examples/quick/views/listview/content/pics/minus-sign.png
diff --git a/examples/quick/modelviews/listview/content/pics/moreDown.png b/examples/quick/views/listview/content/pics/moreDown.png
index 31a35d5c20..31a35d5c20 100644
--- a/examples/quick/modelviews/listview/content/pics/moreDown.png
+++ b/examples/quick/views/listview/content/pics/moreDown.png
diff --git a/examples/quick/modelviews/listview/content/pics/moreUp.png b/examples/quick/views/listview/content/pics/moreUp.png
index fefb9c9098..fefb9c9098 100644
--- a/examples/quick/modelviews/listview/content/pics/moreUp.png
+++ b/examples/quick/views/listview/content/pics/moreUp.png
diff --git a/examples/quick/modelviews/listview/content/pics/pancakes.jpg b/examples/quick/views/listview/content/pics/pancakes.jpg
index 60c439638e..60c439638e 100644
--- a/examples/quick/modelviews/listview/content/pics/pancakes.jpg
+++ b/examples/quick/views/listview/content/pics/pancakes.jpg
diff --git a/examples/quick/modelviews/listview/content/pics/plus-sign.png b/examples/quick/views/listview/content/pics/plus-sign.png
index 40df1134f8..40df1134f8 100644
--- a/examples/quick/modelviews/listview/content/pics/plus-sign.png
+++ b/examples/quick/views/listview/content/pics/plus-sign.png
diff --git a/examples/quick/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/quick/views/listview/content/pics/vegetable-soup.jpg
index 9dce332041..9dce332041 100644
--- a/examples/quick/modelviews/listview/content/pics/vegetable-soup.jpg
+++ b/examples/quick/views/listview/content/pics/vegetable-soup.jpg
diff --git a/examples/quick/modelviews/listview/dynamiclist.qml b/examples/quick/views/listview/dynamiclist.qml
index 6dd225d7b6..6dd225d7b6 100644
--- a/examples/quick/modelviews/listview/dynamiclist.qml
+++ b/examples/quick/views/listview/dynamiclist.qml
diff --git a/examples/quick/modelviews/listview/expandingdelegates.qml b/examples/quick/views/listview/expandingdelegates.qml
index b6af0f6d17..b6af0f6d17 100644
--- a/examples/quick/modelviews/listview/expandingdelegates.qml
+++ b/examples/quick/views/listview/expandingdelegates.qml
diff --git a/examples/quick/modelviews/listview/highlight.qml b/examples/quick/views/listview/highlight.qml
index bf6c9028c5..bf6c9028c5 100644
--- a/examples/quick/modelviews/listview/highlight.qml
+++ b/examples/quick/views/listview/highlight.qml
diff --git a/examples/quick/modelviews/listview/highlightranges.qml b/examples/quick/views/listview/highlightranges.qml
index f0cc1421f0..f0cc1421f0 100644
--- a/examples/quick/modelviews/listview/highlightranges.qml
+++ b/examples/quick/views/listview/highlightranges.qml
diff --git a/examples/quick/modelviews/listview/sections.qml b/examples/quick/views/listview/sections.qml
index 7a9562fa70..7a9562fa70 100644
--- a/examples/quick/modelviews/listview/sections.qml
+++ b/examples/quick/views/listview/sections.qml
diff --git a/examples/quick/views/main.cpp b/examples/quick/views/main.cpp
new file mode 100644
index 0000000000..52704fcd2b
--- /dev/null
+++ b/examples/quick/views/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(views/views)
diff --git a/examples/quick/modelviews/package/Delegate.qml b/examples/quick/views/package/Delegate.qml
index e439716d57..e439716d57 100644
--- a/examples/quick/modelviews/package/Delegate.qml
+++ b/examples/quick/views/package/Delegate.qml
diff --git a/examples/quick/modelviews/package/view.qml b/examples/quick/views/package/view.qml
index f326da4267..f326da4267 100644
--- a/examples/quick/modelviews/package/view.qml
+++ b/examples/quick/views/package/view.qml
diff --git a/examples/quick/modelviews/parallax/content/Clock.qml b/examples/quick/views/parallax/content/Clock.qml
index 05317b1151..05317b1151 100644
--- a/examples/quick/modelviews/parallax/content/Clock.qml
+++ b/examples/quick/views/parallax/content/Clock.qml
diff --git a/examples/quick/modelviews/parallax/content/ParallaxView.qml b/examples/quick/views/parallax/content/ParallaxView.qml
index 2cbb6e6e7c..2cbb6e6e7c 100644
--- a/examples/quick/modelviews/parallax/content/ParallaxView.qml
+++ b/examples/quick/views/parallax/content/ParallaxView.qml
diff --git a/examples/quick/views/parallax/content/QuitButton.qml b/examples/quick/views/parallax/content/QuitButton.qml
new file mode 100644
index 0000000000..8133541b33
--- /dev/null
+++ b/examples/quick/views/parallax/content/QuitButton.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+Image {
+    source: "quit.png"
+    scale: quitMouse.pressed ? 0.8 : 1.0
+    smooth: quitMouse.pressed
+    MouseArea {
+        id: quitMouse
+        anchors.fill: parent
+        anchors.margins: -10
+        onClicked: Qt.quit()
+    }
+}
diff --git a/examples/quick/modelviews/parallax/content/Smiley.qml b/examples/quick/views/parallax/content/Smiley.qml
index d932aaeac0..d932aaeac0 100644
--- a/examples/quick/modelviews/parallax/content/Smiley.qml
+++ b/examples/quick/views/parallax/content/Smiley.qml
diff --git a/examples/quick/modelviews/parallax/content/background.png b/examples/quick/views/parallax/content/background.png
index a885950862..a885950862 100644
--- a/examples/quick/modelviews/parallax/content/background.png
+++ b/examples/quick/views/parallax/content/background.png
diff --git a/examples/quick/modelviews/parallax/content/center.png b/examples/quick/views/parallax/content/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/quick/modelviews/parallax/content/center.png
+++ b/examples/quick/views/parallax/content/center.png
diff --git a/examples/quick/modelviews/parallax/content/clock-night.png b/examples/quick/views/parallax/content/clock-night.png
index cc7151a397..cc7151a397 100644
--- a/examples/quick/modelviews/parallax/content/clock-night.png
+++ b/examples/quick/views/parallax/content/clock-night.png
diff --git a/examples/quick/modelviews/parallax/content/clock.png b/examples/quick/views/parallax/content/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/quick/modelviews/parallax/content/clock.png
+++ b/examples/quick/views/parallax/content/clock.png
diff --git a/examples/quick/modelviews/parallax/content/hour.png b/examples/quick/views/parallax/content/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/quick/modelviews/parallax/content/hour.png
+++ b/examples/quick/views/parallax/content/hour.png
diff --git a/examples/quick/modelviews/parallax/content/minute.png b/examples/quick/views/parallax/content/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/quick/modelviews/parallax/content/minute.png
+++ b/examples/quick/views/parallax/content/minute.png
diff --git a/examples/quick/modelviews/parallax/content/pics/background.jpg b/examples/quick/views/parallax/content/pics/background.jpg
index 61cca2f138..61cca2f138 100644
--- a/examples/quick/modelviews/parallax/content/pics/background.jpg
+++ b/examples/quick/views/parallax/content/pics/background.jpg
diff --git a/examples/quick/modelviews/parallax/content/pics/face-smile.png b/examples/quick/views/parallax/content/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/quick/modelviews/parallax/content/pics/face-smile.png
+++ b/examples/quick/views/parallax/content/pics/face-smile.png
diff --git a/examples/quick/modelviews/parallax/content/pics/home-page.png b/examples/quick/views/parallax/content/pics/home-page.png
index bd090c3708..bd090c3708 100644
--- a/examples/quick/modelviews/parallax/content/pics/home-page.png
+++ b/examples/quick/views/parallax/content/pics/home-page.png
diff --git a/examples/quick/modelviews/parallax/content/pics/home-page.svg b/examples/quick/views/parallax/content/pics/home-page.svg
index 4f16958844..4f16958844 100644
--- a/examples/quick/modelviews/parallax/content/pics/home-page.svg
+++ b/examples/quick/views/parallax/content/pics/home-page.svg
diff --git a/examples/quick/modelviews/parallax/content/pics/shadow.png b/examples/quick/views/parallax/content/pics/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/quick/modelviews/parallax/content/pics/shadow.png
+++ b/examples/quick/views/parallax/content/pics/shadow.png
diff --git a/examples/quick/modelviews/parallax/content/pics/yast-joystick.png b/examples/quick/views/parallax/content/pics/yast-joystick.png
index 858cea0301..858cea0301 100644
--- a/examples/quick/modelviews/parallax/content/pics/yast-joystick.png
+++ b/examples/quick/views/parallax/content/pics/yast-joystick.png
diff --git a/examples/quick/modelviews/parallax/content/pics/yast-wol.png b/examples/quick/views/parallax/content/pics/yast-wol.png
index 7712180a3b..7712180a3b 100644
--- a/examples/quick/modelviews/parallax/content/pics/yast-wol.png
+++ b/examples/quick/views/parallax/content/pics/yast-wol.png
diff --git a/examples/quick/modelviews/parallax/content/quit.png b/examples/quick/views/parallax/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/quick/modelviews/parallax/content/quit.png
+++ b/examples/quick/views/parallax/content/quit.png
diff --git a/examples/quick/modelviews/parallax/content/second.png b/examples/quick/views/parallax/content/second.png
index 4aa9fb5e8e..4aa9fb5e8e 100644
--- a/examples/quick/modelviews/parallax/content/second.png
+++ b/examples/quick/views/parallax/content/second.png
diff --git a/examples/quick/modelviews/parallax/parallax.qml b/examples/quick/views/parallax/parallax.qml
index 74ffab86e8..74ffab86e8 100644
--- a/examples/quick/modelviews/parallax/parallax.qml
+++ b/examples/quick/views/parallax/parallax.qml
diff --git a/examples/quick/modelviews/pathview/pathview-example.qml b/examples/quick/views/pathview/pathview-example.qml
index 38ba08cb16..38ba08cb16 100644
--- a/examples/quick/modelviews/pathview/pathview-example.qml
+++ b/examples/quick/views/pathview/pathview-example.qml
diff --git a/examples/quick/modelviews/pathview/pics/AddressBook_48.png b/examples/quick/views/pathview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/quick/modelviews/pathview/pics/AddressBook_48.png
+++ b/examples/quick/views/pathview/pics/AddressBook_48.png
diff --git a/examples/quick/modelviews/pathview/pics/AudioPlayer_48.png b/examples/quick/views/pathview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/quick/modelviews/pathview/pics/AudioPlayer_48.png
+++ b/examples/quick/views/pathview/pics/AudioPlayer_48.png
diff --git a/examples/quick/modelviews/pathview/pics/Camera_48.png b/examples/quick/views/pathview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/quick/modelviews/pathview/pics/Camera_48.png
+++ b/examples/quick/views/pathview/pics/Camera_48.png
diff --git a/examples/quick/modelviews/pathview/pics/DateBook_48.png b/examples/quick/views/pathview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/quick/modelviews/pathview/pics/DateBook_48.png
+++ b/examples/quick/views/pathview/pics/DateBook_48.png
diff --git a/examples/quick/modelviews/pathview/pics/EMail_48.png b/examples/quick/views/pathview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/quick/modelviews/pathview/pics/EMail_48.png
+++ b/examples/quick/views/pathview/pics/EMail_48.png
diff --git a/examples/quick/modelviews/pathview/pics/TodoList_48.png b/examples/quick/views/pathview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/quick/modelviews/pathview/pics/TodoList_48.png
+++ b/examples/quick/views/pathview/pics/TodoList_48.png
diff --git a/examples/quick/modelviews/pathview/pics/VideoPlayer_48.png b/examples/quick/views/pathview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/quick/modelviews/pathview/pics/VideoPlayer_48.png
+++ b/examples/quick/views/pathview/pics/VideoPlayer_48.png
diff --git a/examples/quick/views/views.pro b/examples/quick/views/views.pro
new file mode 100644
index 0000000000..a79126a838
--- /dev/null
+++ b/examples/quick/views/views.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += \
+    views.qrc \
+    ../shared/shared.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/views
+INSTALLS += target
diff --git a/examples/quick/views/views.qml b/examples/quick/views/views.qml
new file mode 100644
index 0000000000..9d4464933b
--- /dev/null
+++ b/examples/quick/views/views.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "../shared" as Examples
+
+/*!
+    \title QtQuick Examples - Views
+    \example quick/views
+    \brief This is a collection of QML model and view examples
+    \image qml-modelviews-example.png
+
+    This is a collection of small QML examples relating to model and view functionality. They
+    are focused on the views side, which is the visual representation of the data in the models.
+
+    \section2 GridView and PathView demonstrate usage of these elements to display views.
+    \snippet examples/quick/modelviews/gridview/gridview-example.qml 0
+
+    \section2 Dynamic List demonstrates animation of runtime additions and removals to a ListView.
+
+    The ListView.onAdd signal handler runs an animation when new items are added to the
+    view, and the ListView.onRemove another when they are removed.
+    \snippet examples/quick/modelviews/listview/dynamiclist.qml 0
+    \snippet examples/quick/modelviews/listview/dynamiclist.qml 1
+
+    \section2 Expanding Delegates demonstrates delegates that expand when activated.
+
+    It has a complex delegate the size and appearance of which can change, displacing
+    other items in the view.
+    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 0
+    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 1
+    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 2
+    \snippet examples/quick/modelviews/listview/expandingdelegates.qml 3
+
+    \section2 Highlight demonstrates adding a custom highlight to a ListView.
+    \snippet examples/quick/modelviews/listview/highlight.qml 0
+
+    \section2 Highlight Ranges shows the three different highlight range modes of ListView.
+    \snippet examples/quick/modelviews/listview/highlightranges.qml 0
+    \snippet examples/quick/modelviews/listview/highlightranges.qml 1
+    \snippet examples/quick/modelviews/listview/highlightranges.qml 2
+
+    \section2 Sections demonstrates the various section headers and footers available to ListView.
+    \snippet examples/quick/modelviews/listview/sections.qml 0
+
+    \section2 Packages demonstrates using Packages to transition delegates between two views.
+
+    It has a Package which defines delegate items for each view and an item that can
+    be transferred between delegates.
+
+    \snippet examples/quick/modelviews/package/Delegate.qml 0
+
+    A VisualDataModel allows the individual views to access their specific items from
+    the shared package delegate.
+
+    \snippet examples/quick/modelviews/package/view.qml 0
+
+    \section2 VisualItemModel uses a VisualItemModel for the model instead of a ListModel.
+
+    \snippet examples/quick/modelviews/visualitemmodel/visualitemmodel.qml 0
+    */
+
+    Item {
+        height: 480
+        width: 320
+        Examples.LauncherList {
+            id: ll
+            anchors.fill: parent
+            Component.onCompleted: {
+                addExample("GridView", "A simple GridView", Qt.resolvedUrl("gridview/gridview-example.qml"))
+                addExample("Dynamic List", "A dynamically alterable list", Qt.resolvedUrl("listview/dynamiclist.qml"))
+                addExample("Expanding Delegates", "A ListView with delegates that expand", Qt.resolvedUrl("listview/expandingdelegates.qml"))
+                addExample("Highlight", "A ListView with a custom highlight", Qt.resolvedUrl("listview/highlight.qml"))
+                addExample("Highlight Ranges", "The three highlight ranges of ListView", Qt.resolvedUrl("listview/highlightranges.qml"))
+                addExample("Sections", "ListView section headers and footers", Qt.resolvedUrl("listview/sections.qml"))
+                addExample("Packages", "Transitions between a ListView and GridView", Qt.resolvedUrl("package/view.qml"))
+                addExample("PathView", "A simple PathView", Qt.resolvedUrl("pathview/pathview-example.qml"))
+                addExample("VisualItemModel", "Using a VisualItemModel", Qt.resolvedUrl("visualitemmodel/visualitemmodel.qml"))
+            }
+        }
+}
diff --git a/examples/quick/views/views.qmlproject b/examples/quick/views/views.qmlproject
new file mode 100644
index 0000000000..7e6baf0a7f
--- /dev/null
+++ b/examples/quick/views/views.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "views.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
diff --git a/examples/quick/views/views.qrc b/examples/quick/views/views.qrc
new file mode 100644
index 0000000000..e35f128202
--- /dev/null
+++ b/examples/quick/views/views.qrc
@@ -0,0 +1,69 @@
+<RCC>
+    <qresource prefix="/views">
+        <file>gridview/gridview-example.qml</file>
+        <file>gridview/pics/AddressBook_48.png</file>
+        <file>gridview/pics/AudioPlayer_48.png</file>
+        <file>gridview/pics/Camera_48.png</file>
+        <file>gridview/pics/DateBook_48.png</file>
+        <file>gridview/pics/EMail_48.png</file>
+        <file>gridview/pics/TodoList_48.png</file>
+        <file>gridview/pics/VideoPlayer_48.png</file>
+        <file>listview/dynamiclist.qml</file>
+        <file>listview/expandingdelegates.qml</file>
+        <file>listview/highlight.qml</file>
+        <file>listview/highlightranges.qml</file>
+        <file>listview/sections.qml</file>
+        <file>listview/content/PetsModel.qml</file>
+        <file>listview/content/PressAndHoldButton.qml</file>
+        <file>listview/content/RecipesModel.qml</file>
+        <file>listview/content/SmallText.qml</file>
+        <file>listview/content/TextButton.qml</file>
+        <file>listview/content/ToggleButton.qml</file>
+        <file>listview/content/pics/arrow-down.png</file>
+        <file>listview/content/pics/arrow-up.png</file>
+        <file>listview/content/pics/fruit-salad.jpg</file>
+        <file>listview/content/pics/hamburger.jpg</file>
+        <file>listview/content/pics/lemonade.jpg</file>
+        <file>listview/content/pics/list-delete.png</file>
+        <file>listview/content/pics/minus-sign.png</file>
+        <file>listview/content/pics/moreDown.png</file>
+        <file>listview/content/pics/moreUp.png</file>
+        <file>listview/content/pics/pancakes.jpg</file>
+        <file>listview/content/pics/plus-sign.png</file>
+        <file>listview/content/pics/vegetable-soup.jpg</file>
+        <file>package/Delegate.qml</file>
+        <file>package/view.qml</file>
+        <file>parallax/parallax.qml</file>
+        <file>parallax/content/Smiley.qml</file>
+        <file>parallax/content/background.png</file>
+        <file>parallax/content/center.png</file>
+        <file>parallax/content/clock-night.png</file>
+        <file>parallax/content/clock.png</file>
+        <file>parallax/content/Clock.qml</file>
+        <file>parallax/content/hour.png</file>
+        <file>parallax/content/minute.png</file>
+        <file>parallax/content/ParallaxView.qml</file>
+        <file>parallax/content/quit.png</file>
+        <file>parallax/content/QuitButton.qml</file>
+        <file>parallax/content/second.png</file>
+        <file>parallax/content/pics/background.jpg</file>
+        <file>parallax/content/pics/face-smile.png</file>
+        <file>parallax/content/pics/home-page.png</file>
+        <file>parallax/content/pics/home-page.svg</file>
+        <file>parallax/content/pics/shadow.png</file>
+        <file>parallax/content/pics/yast-joystick.png</file>
+        <file>parallax/content/pics/yast-wol.png</file>
+        <file>pathview/pathview-example.qml</file>
+        <file>pathview/pics/AddressBook_48.png</file>
+        <file>pathview/pics/AudioPlayer_48.png</file>
+        <file>pathview/pics/Camera_48.png</file>
+        <file>pathview/pics/DateBook_48.png</file>
+        <file>pathview/pics/EMail_48.png</file>
+        <file>pathview/pics/TodoList_48.png</file>
+        <file>pathview/pics/VideoPlayer_48.png</file>
+        <file>visualdatamodel/slideshow.qml</file>
+        <file>visualdatamodel/dragselection.qml</file>
+        <file>visualitemmodel/visualitemmodel.qml</file>
+        <file>views.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/quick/modelviews/visualdatamodel/dragselection.qml b/examples/quick/views/visualdatamodel/dragselection.qml
index d63b3bd571..d63b3bd571 100644
--- a/examples/quick/modelviews/visualdatamodel/dragselection.qml
+++ b/examples/quick/views/visualdatamodel/dragselection.qml
diff --git a/examples/quick/modelviews/visualdatamodel/slideshow.qml b/examples/quick/views/visualdatamodel/slideshow.qml
index 3f08f974f5..3f08f974f5 100644
--- a/examples/quick/modelviews/visualdatamodel/slideshow.qml
+++ b/examples/quick/views/visualdatamodel/slideshow.qml
diff --git a/examples/quick/modelviews/visualdatamodel/visualdatamodel.qmlproject b/examples/quick/views/visualdatamodel/visualdatamodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/quick/modelviews/visualdatamodel/visualdatamodel.qmlproject
+++ b/examples/quick/views/visualdatamodel/visualdatamodel.qmlproject
diff --git a/examples/quick/modelviews/visualitemmodel/visualitemmodel.qml b/examples/quick/views/visualitemmodel/visualitemmodel.qml
index 20119fc88d..20119fc88d 100644
--- a/examples/quick/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/quick/views/visualitemmodel/visualitemmodel.qml
diff --git a/examples/window/screen/screenInfo.qml b/examples/quick/window/screen/screenInfo.qml
index adf92ee028..adf92ee028 100644
--- a/examples/window/screen/screenInfo.qml
+++ b/examples/quick/window/screen/screenInfo.qml
diff --git a/examples/quick/window/window.pro b/examples/quick/window/window.pro
new file mode 100644
index 0000000000..93e43fcd65
--- /dev/null
+++ b/examples/quick/window/window.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    window
+
+EXAMPLE_FILES = \
+    screen
diff --git a/examples/window/window/Window.qml b/examples/quick/window/window/Window.qml
index b7fbf7206c..b7fbf7206c 100644
--- a/examples/window/window/Window.qml
+++ b/examples/quick/window/window/Window.qml
diff --git a/examples/window/window/nogui.qml b/examples/quick/window/window/nogui.qml
index bed055679d..bed055679d 100644
--- a/examples/window/window/nogui.qml
+++ b/examples/quick/window/window/nogui.qml
diff --git a/examples/window/window/standalone.qml b/examples/quick/window/window/standalone.qml
index a7a7ed2d7a..a7a7ed2d7a 100644
--- a/examples/window/window/standalone.qml
+++ b/examples/quick/window/window/standalone.qml
diff --git a/examples/window/window/twowindows.qml b/examples/quick/window/window/twowindows.qml
index 345598cf12..345598cf12 100644
--- a/examples/window/window/twowindows.qml
+++ b/examples/quick/window/window/twowindows.qml
diff --git a/examples/window/window/window.cpp b/examples/quick/window/window/window.cpp
index c9e6e90997..619e275f75 100644
--- a/examples/window/window/window.cpp
+++ b/examples/quick/window/window/window.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
     QQmlEngine engine;
     QQmlComponent component(&engine);
-    component.loadUrl(QUrl::fromLocalFile("Window.qml"));
+    component.loadUrl(QUrl("qrc:///window/window/Window.qml"));
     if ( component.isReady() )
         component.create();
     else
diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro
new file mode 100644
index 0000000000..e62decb733
--- /dev/null
+++ b/examples/quick/window/window/window.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+QT += qml
+
+SOURCES += window.cpp
+RESOURCES += window.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window
+INSTALLS = target
diff --git a/examples/quick/window/window/window.qrc b/examples/quick/window/window/window.qrc
new file mode 100644
index 0000000000..c203c140fc
--- /dev/null
+++ b/examples/quick/window/window/window.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/window/window">
+        <file>Window.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/shared/shared.h b/examples/shared/shared.h
deleted file mode 100644
index 7fd2f08a40..0000000000
--- a/examples/shared/shared.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QDir>
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQuickView>
-#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
-{\
-    QGuiApplication app(argc,argv);\
-    QQuickView view;\
-    QDir directory(QCoreApplication::applicationDirPath());\
-    if (QGuiApplication::platformName() == QLatin1String("windows")) {\
-        if (directory.absolutePath().endsWith("/debug", Qt::CaseInsensitive)\
-            || directory.absolutePath().endsWith("/release", Qt::CaseInsensitive))\
-            if (!directory.cdUp()) {\
-                qWarning("Could not change to parent directory of '%s'",\
-                    qPrintable(QDir::toNativeSeparators(directory.absolutePath())));\
-                return -1;\
-            }\
-    } else if (QGuiApplication::platformName() == QLatin1String("cocoa")) {\
-        if (directory.absolutePath().endsWith(#NAME".app/Contents/MacOS"))\
-            for (int i = 0; i < 3; ++i) {\
-                if (!directory.cdUp()) {\
-                    qWarning("Could not change to parent directory of '%s'",\
-                        qPrintable(QDir::toNativeSeparators(directory.absolutePath())));\
-                    return -1;\
-                }\
-            }\
-    }\
-    const QString fileName(directory.absolutePath() + "/" #NAME ".qml");\
-    if (!QFile::exists(fileName)) {\
-            qWarning("Could not find file '%s'", qPrintable(QDir::toNativeSeparators(fileName)));\
-            return -1;\
-    }\
-    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\
-    view.setSource(QUrl::fromLocalFile(fileName)); \
-    if (QGuiApplication::platformName() == QLatin1String("qnx") || \
-          QGuiApplication::platformName() == QLatin1String("eglfs")) {\
-        view.setResizeMode(QQuickView::SizeRootObjectToView);\
-        view.showFullScreen();\
-    } else {\
-        view.show();\
-    }\
-    return app.exec();\
-}
diff --git a/examples/shared/shared.pro b/examples/shared/shared.pro
deleted file mode 100644
index 3bc9bfebbe..0000000000
--- a/examples/shared/shared.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-#just install the files, all QML for now
-TEMPLATE = aux
-
-qml.files = images \
-            LauncherList.qml \
-            SimpleLauncherDelegate.qml \
-            Button.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/shared
-INSTALLS = qml
diff --git a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
deleted file mode 100644
index 10ce079896..0000000000
--- a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS       = \
-                filedialog\
-
-# install
-sources.files = gettingStartedQml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml
-INSTALLS += sources
diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
deleted file mode 100644
index 9cb5c57c3f..0000000000
--- a/examples/tutorials/tutorials.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += gettingStartedQml
-
-# install
-sources.files = tutorials.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials
-INSTALLS += sources
diff --git a/examples/window/window.pro b/examples/window/window.pro
deleted file mode 100644
index 5dea5d621f..0000000000
--- a/examples/window/window.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    #screen \
-    window
-
-# install
-sources.files = window.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window
-INSTALLS += sources
diff --git a/examples/window/window/window.pro b/examples/window/window/window.pro
deleted file mode 100644
index 7939773b17..0000000000
--- a/examples/window/window/window.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-CONFIG += qt
-QT += qml
-
-SOURCES += window.cpp
-OTHER_FILES = Window.qml nogui.qml standalone.qml twowindows.qml
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window/window
-sources.files = $$SOURCES $$OTHER_FILES window.pro
-sources.path = $$target.path
-INSTALLS = sources target
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 2d70b15764..58c33f27ca 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1,2 +1 @@
 load(qt_parts)
-
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 12ea9334f8..e5381629cc 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -880,7 +880,7 @@ Module {
             values: {
                 "XAxis": 1,
                 "YAxis": 2,
-                "XandYAxis": 3
+                "XAndYAxis": 3
             }
         }
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
@@ -2337,7 +2337,7 @@ Module {
                 "NoDrag": 0,
                 "XAxis": 1,
                 "YAxis": 2,
-                "XandYAxis": 3
+                "XAndYAxis": 3
             }
         }
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
diff --git a/src/particles/particles.pro b/src/particles/particles.pro
index de855faf8a..632856ccca 100644
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -1,6 +1,6 @@
 TARGET = QtQuickParticles
 
-CONFIG += dll warn_on internal_module
+CONFIG += internal_module
 
 QT = core-private gui-private qml-private quick-private
 QT_PRIVATE = v8-private
diff --git a/src/plugins/accessible/quick/main.cpp b/src/plugins/accessible/quick/main.cpp
index 882cbcda4f..cac5d7e58d 100644
--- a/src/plugins/accessible/quick/main.cpp
+++ b/src/plugins/accessible/quick/main.cpp
@@ -92,22 +92,7 @@ QAccessibleInterface *AccessibleQuickFactory::create(const QString &classname, Q
         QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
         if (!itemPrivate->isAccessible)
             return 0;
-
-        QVariant v = QQuickAccessibleAttached::property(item, "role");
-        bool ok;
-        QAccessible::Role role = (QAccessible::Role)v.toInt(&ok);
-        if (!ok)    // Not sure if this check is needed.
-            return new QAccessibleQuickItem(item);
-
-        switch (role) {
-        case QAccessible::Slider:
-        case QAccessible::SpinBox:
-        case QAccessible::Dial:
-        case QAccessible::ScrollBar:
-            return new QAccessibleQuickItemValueInterface(item);
-        default:
-            return new QAccessibleQuickItem(item);
-        }
+        return new QAccessibleQuickItem(item);
     }
 
     return 0;
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index 2d41379940..8d36834d48 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
@@ -228,7 +228,7 @@ QString QAccessibleQuickItem::text(QAccessible::Text textType) const
         break;
     }
 
-    // the following blocks handles item-specific behavior
+    // the following block handles item-specific behavior
     if (role() == QAccessible::EditableText) {
         if (textType == QAccessible::Value) {
             QVariant text = object()->property("text");
@@ -241,34 +241,44 @@ QString QAccessibleQuickItem::text(QAccessible::Text textType) const
     return QString();
 }
 
-void *QAccessibleQuickItemValueInterface::interface_cast(QAccessible::InterfaceType t)
+void *QAccessibleQuickItem::interface_cast(QAccessible::InterfaceType t)
 {
-    if (t == QAccessible::ValueInterface)
+    QAccessible::Role r = role();
+    if (t == QAccessible::ValueInterface &&
+           (r == QAccessible::Slider ||
+            r == QAccessible::SpinBox ||
+            r == QAccessible::Dial ||
+            r == QAccessible::ScrollBar))
        return static_cast<QAccessibleValueInterface*>(this);
-    return QAccessibleQuickItem::interface_cast(t);
+
+    if (t == QAccessible::TextInterface &&
+            (r == QAccessible::EditableText))
+        return static_cast<QAccessibleTextInterface*>(this);
+
+    return QQmlAccessible::interface_cast(t);
 }
 
-QVariant QAccessibleQuickItemValueInterface::currentValue() const
+QVariant QAccessibleQuickItem::currentValue() const
 {
     return item()->property("value");
 }
 
-void QAccessibleQuickItemValueInterface::setCurrentValue(const QVariant &value)
+void QAccessibleQuickItem::setCurrentValue(const QVariant &value)
 {
     item()->setProperty("value", value);
 }
 
-QVariant QAccessibleQuickItemValueInterface::maximumValue() const
+QVariant QAccessibleQuickItem::maximumValue() const
 {
     return item()->property("maximumValue");
 }
 
-QVariant QAccessibleQuickItemValueInterface::minimumValue() const
+QVariant QAccessibleQuickItem::minimumValue() const
 {
     return item()->property("minimumValue");
 }
 
-QVariant QAccessibleQuickItemValueInterface::minimumStepSize() const
+QVariant QAccessibleQuickItem::minimumStepSize() const
 {
     return item()->property("stepSize");
 }
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.h b/src/plugins/accessible/quick/qaccessiblequickitem.h
index 0d31749ee0..46f573cc75 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.h
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY
 
-class QAccessibleQuickItem : public QQmlAccessible
+class QAccessibleQuickItem : public QQmlAccessible, public QAccessibleValueInterface, public QAccessibleTextInterface
 {
 public:
     QAccessibleQuickItem(QQuickItem *item);
@@ -72,28 +72,51 @@ public:
 
     bool isAccessible() const;
 
-protected:
-    QQuickItem *item() const { return static_cast<QQuickItem*>(object()); }
-};
-
-QRect itemScreenRect(QQuickItem *item);
-
-
-class QAccessibleQuickItemValueInterface: public QAccessibleQuickItem, public QAccessibleValueInterface
-{
-public:
-    QAccessibleQuickItemValueInterface(QQuickItem *item) : QAccessibleQuickItem(item)
-    {}
-
-    void *interface_cast(QAccessible::InterfaceType t);
-
+    // Value Interface
     QVariant currentValue() const;
     void setCurrentValue(const QVariant &value);
     QVariant maximumValue() const;
     QVariant minimumValue() const;
     QVariant minimumStepSize() const;
+
+
+    // Text Interface
+    // selection (ignored for now)
+    void selection(int selectionIndex, int *startOffset, int *endOffset) const { *startOffset = 0; *endOffset = 0; }
+    int selectionCount() const { return 0; }
+    void addSelection(int startOffset, int endOffset) {}
+    void removeSelection(int selectionIndex) {}
+    void setSelection(int selectionIndex, int startOffset, int endOffset) {}
+
+    // cursor
+    int cursorPosition() const { return 0; }
+    void setCursorPosition(int position) {}
+
+    // text
+    QString text(int startOffset, int endOffset) const { return text(QAccessible::Name).mid(startOffset, endOffset - startOffset); }
+//    QString textBeforeOffset(int offset, QAccessible2::BoundaryType boundaryType,
+//                                     int *startOffset, int *endOffset) const;
+//    QString textAfterOffset(int offset, QAccessible2::BoundaryType boundaryType,
+//                                    int *startOffset, int *endOffset) const;
+//    QString textAtOffset(int offset, QAccessible2::BoundaryType boundaryType,
+//                                 int *startOffset, int *endOffset) const;
+    int characterCount() const { return text(QAccessible::Name).count(); }
+
+    // character <-> geometry
+    QRect characterRect(int offset) const { return QRect(); }
+    int offsetAtPoint(const QPoint &point) const { return -1; }
+
+    void scrollToSubstring(int startIndex, int endIndex) {}
+    QString attributes(int offset, int *startOffset, int *endOffset) const { return QString(); }
+
+protected:
+    QQuickItem *item() const { return static_cast<QQuickItem*>(object()); }
+    void *interface_cast(QAccessible::InterfaceType t);
 };
 
+QRect itemScreenRect(QQuickItem *item);
+
+
 #endif // QT_NO_ACCESSIBILITY
 
 QT_END_NAMESPACE
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index eabe44848b..d3a730c396 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -1,6 +1,7 @@
 TARGET  = qtaccessiblequick
 
 PLUGIN_TYPE = accessible
+PLUGIN_CLASS_NAME = AccessibleQuickFactory
 load(qt_plugin)
 
 include ($$PWD/../shared/qaccessiblebase.pri)
diff --git a/src/plugins/accessible/shared/qaccessiblebase.pri b/src/plugins/accessible/shared/qaccessiblebase.pri
index 061d154277..827df0f132 100644
--- a/src/plugins/accessible/shared/qaccessiblebase.pri
+++ b/src/plugins/accessible/shared/qaccessiblebase.pri
@@ -1,4 +1,3 @@
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 SOURCES += $$PWD/qqmlaccessible.cpp
 HEADERS += $$PWD/qqmlaccessible.h
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
index 6d486ecc2f..6172ee95cf 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
+++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
@@ -2,6 +2,7 @@ TARGET = qmldbg_ost
 QT       += qml network
 
 PLUGIN_TYPE = qmltooling
+PLUGIN_CLASS_NAME = QmlOstPlugin
 load(qt_plugin)
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index d05f4b9b59..93cbdf3018 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -166,6 +166,7 @@ void InspectTool::hoverMoveEvent(QMouseEvent *event)
     }
 }
 
+#ifndef QT_NO_WHEELEVENT
 void InspectTool::wheelEvent(QWheelEvent *event)
 {
     if (event->orientation() != Qt::Vertical)
@@ -184,6 +185,7 @@ void InspectTool::wheelEvent(QWheelEvent *event)
         }
     }
 }
+#endif
 
 void InspectTool::keyReleaseEvent(QKeyEvent *event)
 {
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
index 5c480697af..5ed243d361 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
@@ -79,7 +79,9 @@ public:
     void mouseDoubleClickEvent(QMouseEvent *);
 
     void hoverMoveEvent(QMouseEvent *);
+#ifndef QT_NO_WHEELEVENT
     void wheelEvent(QWheelEvent *);
+#endif
 
     void keyPressEvent(QKeyEvent *) {}
     void keyReleaseEvent(QKeyEvent *);
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index 6c672c2417..d11ef590bd 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -2,6 +2,7 @@ TARGET = qmldbg_qtquick2
 QT       += qml-private quick-private core-private gui-private v8-private
 
 PLUGIN_TYPE = qmltooling
+PLUGIN_CLASS_NAME = QtQuick2Plugin
 load(qt_plugin)
 
 INCLUDEPATH *= $$PWD $$PWD/../shared
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index 859aeeffdc..e9c97b875b 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -2,6 +2,7 @@ TARGET = qmldbg_tcp
 QT = qml-private network v8-private core-private
 
 PLUGIN_TYPE = qmltooling
+PLUGIN_CLASS_NAME = QTcpServerConnection
 load(qt_plugin)
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h
index f29909baf0..6e7d0c09cb 100644
--- a/src/plugins/qmltooling/shared/abstracttool.h
+++ b/src/plugins/qmltooling/shared/abstracttool.h
@@ -74,7 +74,9 @@ public:
     virtual void mouseDoubleClickEvent(QMouseEvent *event) = 0;
 
     virtual void hoverMoveEvent(QMouseEvent *event) = 0;
+#ifndef QT_NO_WHEELEVENT
     virtual void wheelEvent(QWheelEvent *event) = 0;
+#endif
 
     virtual void keyPressEvent(QKeyEvent *event) = 0;
     virtual void keyReleaseEvent(QKeyEvent *keyEvent) = 0;
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index ed207c5f26..c1d0cf1343 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
@@ -173,10 +173,12 @@ bool AbstractViewInspector::eventFilter(QObject *obj, QEvent *event)
         if (mouseDoubleClickEvent(static_cast<QMouseEvent*>(event)))
             return true;
         break;
+#ifndef QT_NO_WHEELEVENT
     case QEvent::Wheel:
         if (wheelEvent(static_cast<QWheelEvent*>(event)))
             return true;
         break;
+#endif
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
@@ -244,12 +246,14 @@ bool AbstractViewInspector::mouseDoubleClickEvent(QMouseEvent *event)
     return true;
 }
 
+#ifndef QT_NO_WHEELEVENT
 bool AbstractViewInspector::wheelEvent(QWheelEvent *event)
 {
     foreach (AbstractTool *tool, m_tools)
         tool->wheelEvent(event);
     return true;
 }
+#endif
 
 bool AbstractViewInspector::touchEvent(QTouchEvent *event)
 {
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index d98707eaca..e0524c880c 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -107,7 +107,9 @@ protected:
     virtual bool keyPressEvent(QKeyEvent *event);
     virtual bool keyReleaseEvent(QKeyEvent *keyEvent);
     virtual bool mouseDoubleClickEvent(QMouseEvent *event);
+#ifndef QT_NO_WHEELEVENT
     virtual bool wheelEvent(QWheelEvent *event);
+#endif
     virtual bool touchEvent(QTouchEvent *event);
     virtual void setShowAppOnTop(bool) = 0;
 
diff --git a/src/plugins/qmltooling/shared/qpacketprotocol.cpp b/src/plugins/qmltooling/shared/qpacketprotocol.cpp
index 205601c3bf..020e5dbe9d 100644
--- a/src/plugins/qmltooling/shared/qpacketprotocol.cpp
+++ b/src/plugins/qmltooling/shared/qpacketprotocol.cpp
@@ -290,6 +290,7 @@ void QPacketProtocol::send(const QPacket & p)
     d->sendingPackets.append(sendSize);
     qint32 sendSize32 = sendSize;
     qint64 writeBytes = d->dev->write((char *)&sendSize32, sizeof(qint32));
+    Q_UNUSED(writeBytes);
     Q_ASSERT(writeBytes == sizeof(qint32));
     writeBytes = d->dev->write(p.b);
     Q_ASSERT(writeBytes == p.b.size());
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp
index df8431e746..67b3391c0c 100644
--- a/src/qml/animations/qabstractanimationjob.cpp
+++ b/src/qml/animations/qabstractanimationjob.cpp
@@ -463,7 +463,7 @@ void QAbstractAnimationJob::setCurrentTime(int msecs)
     // and has reached the end.
     if ((m_direction == Forward && m_totalCurrentTime == totalDura)
         || (m_direction == Backward && m_totalCurrentTime == 0)) {
-        stop();
+        RETURN_IF_DELETED(stop());
     }
 
     if (m_hasCurrentTimeChangeListeners)
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 301b6be660..06c1c42a92 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -3,41 +3,38 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtQml
 description             = Qt QML Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtqml
-version                 = 5.0.0
+version                 = 5.0.1
 
 qhp.projects            = QtQml
 
 qhp.QtQml.file                = qtqml.qhp
 qhp.QtQml.namespace           = org.qt-project.qtqml.500
-qhp.QtQml.virtualFolder       = qdoc
-qhp.QtQml.indexTitle          = Qt QML Reference Documentation
+qhp.QtQml.virtualFolder       = qtqml
+qhp.QtQml.indexTitle          = Qt QML
 qhp.QtQml.indexRoot           =
 
-qhp.QtQml.filterAttributes    = qtqml 5.0.0 qtrefdoc
-qhp.QtQml.customFilters.Qt.name = QtQml 5.0.0
-qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.0.0
-qhp.QtQml.subprojects         = classes overviews examples
-qhp.QtQml.subprojects.classes.title = Classes
-qhp.QtQml.subprojects.classes.indexTitle = Qt QML's Classes
+qhp.QtQml.filterAttributes    = qtqml 5.0.1 qtrefdoc
+qhp.QtQml.customFilters.Qt.name = QtQml 5.0.1
+qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.0.1
+qhp.QtQml.subprojects         = classes examples
+qhp.QtQml.subprojects.classes.title = C++ Classes
+qhp.QtQml.subprojects.classes.indexTitle = Qt QML Module C++ Classes
 qhp.QtQml.subprojects.classes.selectors = class fake:headerfile
 qhp.QtQml.subprojects.classes.sortPages = true
-qhp.QtQml.subprojects.overviews.title = Overviews
-qhp.QtQml.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtQml.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtQml.subprojects.examples.title = Qt QML Examples
-qhp.QtQml.subprojects.examples.indexTitle = Qt QML Examples
+qhp.QtQml.subprojects.examples.title = Examples
+qhp.QtQml.subprojects.examples.indexTitle = Qt Quick Code Samples
 qhp.QtQml.subprojects.examples.selectors = fake:example
 
+
 tagfile                 = ../../../doc/qtqml/qtqml.tags
 
-depends += qtcore qtxmlpatterns qtgui
+depends += qtcore qtxmlpatterns qtgui qtquick
 
 headerdirs  += ..
 
 sourcedirs  += ..
 
 exampledirs += ../../../examples/qml \
-               ../../.. \
                ../ \
                snippets
 
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index d59a8cd827..8ed3aa8279 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -44,12 +44,12 @@ examples/quick/tutorials/extending directory.
 Tutorial chapters:
 
 \list 1
-\li \l{examples/tutorials/extending/chapter1-basics}{Creating a New Type}
-\li \l{examples/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
-\li \l{examples/tutorials/extending/chapter3-bindings}{Property Binding}
-\li \l{examples/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
-\li \l{examples/tutorials/extending/chapter5-listproperties}{Using List Property Types}
-\li \l{examples/tutorials/extending/chapter6-plugins}{Writing an Extension Plugin}
+\li \l{examples/quick/tutorials/extending/chapter1-basics}{Creating a New Type}
+\li \l{examples/quick/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
+\li \l{examples/quick/tutorials/extending/chapter3-bindings}{Property Binding}
+\li \l{examples/quick/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
+\li \l{examples/quick/tutorials/extending/chapter5-listproperties}{Using List Property Types}
+\li \l{examples/quick/tutorials/extending/chapter6-plugins}{Writing an Extension Plugin}
 \li \l{qml-extending-tutorial7.html}{In Summary}
 \endlist
 
@@ -64,7 +64,7 @@ and \l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
 /*!
 \title Chapter 1: Creating a New Type
 
-\example examples/tutorials/extending/chapter1-basics
+\example examples/quick/tutorials/extending/chapter1-basics
 
 A common task when extending QML is to provide a new QML type that supports some
  custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{QtQuick types}.
@@ -104,7 +104,7 @@ this new class must:
 
 Here is our \c PieChart class, defined in \c piechart.h:
 
-\snippet examples/tutorials/extending/chapter1-basics/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.h 0
 
 The class inherits from QQuickPaintedItem because we want to override
 QQuickPaintedItem::paint() in perform drawing operations with the QPainter API.
@@ -120,15 +120,15 @@ simply sets and returns the \c m_name and \c m_color values as appropriate, and
 implements \c paint() to draw a simple pie chart. It also turns off the
 QGraphicsItem::ItemHasNoContents flag to enable painting:
 
-\snippet examples/tutorials/extending/chapter1-basics/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.cpp 0
 \dots 0
-\snippet examples/tutorials/extending/chapter1-basics/piechart.cpp 1
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.cpp 1
 
 Now that we have defined the \c PieChart type, we will use it from QML. The \c app.qml
 file creates a \c PieChart item and display the pie chart's details
 using a standard QML \l Text item:
 
-\snippet examples/tutorials/extending/chapter1-basics/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/app.qml 0
 
 Notice that although the color is specified as a string in QML, it is automatically
 converted to a QColor object for the PieChart \c color property. Automatic conversions are
@@ -142,46 +142,46 @@ you don't register the type, \c app.qml won't be able to create a \c PieChart.
 
 Here is the application \c main.cpp:
 
-\snippet examples/tutorials/extending/chapter1-basics/main.cpp 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/main.cpp 0
 
 This call to qmlRegisterType() registers the \c PieChart type as a type called "PieChart",
 in a type namespace called "Charts", with a version of 1.0.
 
 Lastly, we write a \c .pro project file that includes the files and the \c declarative library:
 
-\quotefile examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
+\quotefile examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
 
 Now we can build and run the application:
 
 \image extending-tutorial-chapter1.png
 
-Try it yourself with the code in Qt's \c examples/tutorials/extending/chapter1-basics directory.
+Try it yourself with the code in Qt's \c examples/quick/tutorials/extending/chapter1-basics directory.
 */
 
 
 /*!
 \title Chapter 2: Connecting to C++ Methods and Signals
 
-\example examples/tutorials/extending/chapter2-methods
+\example examples/quick/tutorials/extending/chapter2-methods
 
 Suppose we want \c PieChart to have a "clearChart()" method that erases the
 chart and then emits a "chartCleared" signal. Our \c app.qml would be able
 to call \c clearChart() and receive \c chartCleared() signals like this:
 
-\snippet examples/tutorials/extending/chapter2-methods/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/app.qml 0
 
 \image extending-tutorial-chapter2.png
 
 To do this, we add a \c clearChart() method and a \c chartCleared() signal
 to our C++ class:
 
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 3
 
 The use of Q_INVOKABLE makes the \c clearChart() method available to the
 Qt Meta-Object system, and in turn, to QML. Note that it could have
@@ -191,7 +191,7 @@ slots are also callable from QML. Both of these approaches are valid.
 The \c clearChart() method simply changes the color to Qt::transparent,
 repaints the chart, then emits the \c chartCleared() signal:
 
-\snippet examples/tutorials/extending/chapter2-methods/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.cpp 0
 
 Now when we run the application and click the window, the pie chart
 disappears, and the application outputs:
@@ -200,14 +200,14 @@ disappears, and the application outputs:
     The chart has been cleared
 \endcode
 
-Try out the example yourself with the updated code in Qt's \c examples/tutorials/extending/chapter2-methods directory.
+Try out the example yourself with the updated code in Qt's \c examples/quick/tutorials/extending/chapter2-methods directory.
 
 */
 
 /*!
 \title Chapter 3: Adding Property Bindings
 
-\example examples/tutorials/extending/chapter3-bindings
+\example examples/quick/tutorials/extending/chapter3-bindings
 
 Property binding is a powerful feature of QML that allows values of different
 elements to be synchronized automatically. It uses signals to notify and update
@@ -216,7 +216,7 @@ other elements' values when property values are changed.
 Let's enable property bindings for the \c color property. That means
 if we have code like this:
 
-\snippet examples/tutorials/extending/chapter3-bindings/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/app.qml 0
 
 \image extending-tutorial-chapter3.png
 
@@ -231,17 +231,17 @@ It's easy to enable property binding for the \c color property.
 We add a \l{Qt's Property System}{NOTIFY} feature to its Q_PROPERTY() declaration to indicate that a "colorChanged" signal
 is emitted whenever the value changes.
 
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 3
 
 Then, we emit this signal in \c setPieSlice():
 
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp 0
 
 It's important for \c setColor() to check that the color value has actually changed
 before emitting \c colorChanged(). This ensures the signal is not emitted unnecessarily and
@@ -259,7 +259,7 @@ custom QML types may see unexpected behavior if bindings are not implemented.
 /*!
 \title Chapter 4: Using Custom Property Types
 
-\example examples/tutorials/extending/chapter4-customPropertyTypes
+\example examples/quick/tutorials/extending/chapter4-customPropertyTypes
 
 The \c PieChart type currently has a string-type property and a color-type property.
 It could have many other types of properties. For example, it could have an
@@ -299,43 +299,43 @@ For example, let's replace the use of the \c property with a type called
 "PieSlice" that has a \c color property. Instead of assigning a color,
 we assign an \c PieSlice value which itself contains a \c color:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml 0
 
 Like \c PieChart, this new \c PieSlice type inherits from QQuickPaintedItem and declares
 its properties with Q_PROPERTY():
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h 0
 
 To use it in \c PieChart, we modify the \c color property declaration
 and associated method signatures:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 3
 
 There is one thing to be aware of when implementing \c setPieSlice(). The \c PieSlice
 is a visual item, so it must be set as a child of the \c PieChart using
 QQuickItem::setParentItem() so that the \c PieChart knows to paint this child
 item when its contents are drawn:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp 0
 
 
 Like the \c PieChart type, the \c PieSlice type has to be registered
 using qmlRegisterType() to be used from QML. As with \c PieChart, we'll add the
 type to the "Charts" type namespace, version 1.0:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 0
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 1
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 1
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 2
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 2
 
-Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-customPropertyTypes directory.
+Try it out with the code in Qt's \c examples/quick/tutorials/extending/chapter4-customPropertyTypes directory.
 
 */
 
@@ -343,13 +343,13 @@ Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-custom
 /*!
 \title Chapter 5: Using List Property Types
 
-\example examples/tutorials/extending/chapter5-listproperties
+\example examples/quick/tutorials/extending/chapter5-listproperties
 
 Right now, a \c PieChart can only have one \c PieSlice. Ideally a chart would
 have multiple slices, with different colors and sizes. To do this, we could
 have a \c slices property that accepts a list of \c PieSlice items:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/app.qml 0
 
 \image extending-tutorial-chapter5.png
 
@@ -360,11 +360,11 @@ function with a \c slices() function that returns a list of slices, and add
 an internal \c append_slice() function (discussed below). We also use a QList to
 store the internal list of slices as \c m_slices:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 2
 
 Although the \c slices property does not have an associated \c WRITE function,
 it is still modifiable because of the way QQmlListProperty works.
@@ -373,7 +373,7 @@ return a QQmlListProperty value and indicate that the internal
 \c PieChart::append_slice() function is to be called whenever a request is made from QML
 to add items to the list:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp 0
 
 The \c append_slice() function simply sets the parent item as before,
 and adds the new item to the \c m_slices list. As you can see, the append function for a
@@ -384,7 +384,7 @@ The \c PieSlice class has also been modified to include \c fromAngle and \c angl
 properties and to draw the slice according to these values. This is a straightforward
 modification if you have read the previous pages in this tutorial, so the code is not shown here.
 
-The complete code can be seen in the updated \c examples/tutorials/extending/chapter5-listproperties directory.
+The complete code can be seen in the updated \c examples/quick/tutorials/extending/chapter5-listproperties directory.
 
 */
 
@@ -392,7 +392,7 @@ The complete code can be seen in the updated \c examples/tutorials/extending/cha
 /*!
 \title Chapter 6: Writing an Extension Plugin
 
-\example examples/tutorials/extending/chapter6-plugins
+\example examples/quick/tutorials/extending/chapter6-plugins
 
 Currently the \c PieChart and \c PieSlice types are used by \c app.qml,
 which is displayed using a QQuickView in a C++ application. An alternative
@@ -407,22 +407,22 @@ and registers our QML types in the inherited \l{QQmlExtensionPlugin::}{registerT
 
 Here is the \c ChartsPlugin definition in \c chartsplugin.h:
 
-\snippet examples/tutorials/extending/chapter6-plugins/chartsplugin.h 0
+\snippet examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h 0
 
 And its implementation in \c chartsplugin.cpp:
 
-\snippet examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp 0
+\snippet examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp 0
 
 Then, we write a \c .pro project file that defines the project as a plugin library
 and specifies with DESTDIR that library files should be built into a "lib" subdirectory:
 
-\quotefile examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+\quotefile examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
 
 Finally, we add a \l{qtqml-modules-qmldir.html}{qmldir} file that is
 parsed by the QML engine.  In this file, we specify that a plugin named
 "chapter6-plugin" (the name of the example project) can be found in the "lib" subdirectory:
 
-\quotefile examples/tutorials/extending/chapter6-plugins/Charts/qmldir
+\quotefile examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
 
 Now we have a plugin, and instead of having a main.cpp and an executable, we can build
 the project and then load the QML file using the \l{Prototyping with qmlscene}{qmlscene tool},
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc
index f32f1d96c5..c9c661434f 100644
--- a/src/qml/doc/src/external-resources.qdoc
+++ b/src/qml/doc/src/external-resources.qdoc
@@ -28,7 +28,9 @@
 /*!
     \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
     \title ECMA-262
+*/
 
+/*!
     \externalpage http://www.w3schools.com/jsref/default.asp
     \title W3Schools JavaScript Reference
 */
diff --git a/src/qml/qml/parser/qqmljskeywords_p.h b/src/qml/qml/parser/qqmljskeywords_p.h
index d06c996099..ae8adcc30f 100644
--- a/src/qml/qml/parser/qqmljskeywords_p.h
+++ b/src/qml/qml/parser/qqmljskeywords_p.h
@@ -104,7 +104,7 @@ static inline int classify3(const QChar *s, bool qmlMode) {
   else if (s[0].unicode() == 'i') {
     if (s[1].unicode() == 'n') {
       if (s[2].unicode() == 't') {
-        return qmlMode ? Lexer::T_INT : Lexer::T_IDENTIFIER;
+        return qmlMode ? int(Lexer::T_INT) : int(Lexer::T_IDENTIFIER);
       }
     }
   }
@@ -144,7 +144,7 @@ static inline int classify4(const QChar *s, bool qmlMode) {
     if (s[1].unicode() == 'y') {
       if (s[2].unicode() == 't') {
         if (s[3].unicode() == 'e') {
-          return qmlMode ? Lexer::T_BYTE : Lexer::T_IDENTIFIER;
+          return qmlMode ? int(Lexer::T_BYTE) : int(Lexer::T_IDENTIFIER);
         }
       }
     }
@@ -160,7 +160,7 @@ static inline int classify4(const QChar *s, bool qmlMode) {
     else if (s[1].unicode() == 'h') {
       if (s[2].unicode() == 'a') {
         if (s[3].unicode() == 'r') {
-          return qmlMode ? Lexer::T_CHAR : Lexer::T_IDENTIFIER;
+          return qmlMode ? int(Lexer::T_CHAR) : int(Lexer::T_IDENTIFIER);
         }
       }
     }
@@ -185,7 +185,7 @@ static inline int classify4(const QChar *s, bool qmlMode) {
     if (s[1].unicode() == 'o') {
       if (s[2].unicode() == 't') {
         if (s[3].unicode() == 'o') {
-          return qmlMode ? Lexer::T_GOTO : Lexer::T_IDENTIFIER;
+          return qmlMode ? int(Lexer::T_GOTO) : int(Lexer::T_IDENTIFIER);
         }
       }
     }
@@ -194,7 +194,7 @@ static inline int classify4(const QChar *s, bool qmlMode) {
     if (s[1].unicode() == 'o') {
       if (s[2].unicode() == 'n') {
         if (s[3].unicode() == 'g') {
-          return qmlMode ? Lexer::T_LONG : Lexer::T_IDENTIFIER;
+          return qmlMode ? int(Lexer::T_LONG) : int(Lexer::T_IDENTIFIER);
         }
       }
     }
@@ -280,7 +280,7 @@ static inline int classify5(const QChar *s, bool qmlMode) {
       if (s[2].unicode() == 'n') {
         if (s[3].unicode() == 's') {
           if (s[4].unicode() == 't') {
-            return qmlMode ? Lexer::T_CONST : Lexer::T_RESERVED_WORD;
+            return qmlMode ? int(Lexer::T_CONST) : int(Lexer::T_RESERVED_WORD);
           }
         }
       }
@@ -300,7 +300,7 @@ static inline int classify5(const QChar *s, bool qmlMode) {
       if (s[2].unicode() == 'n') {
         if (s[3].unicode() == 'a') {
           if (s[4].unicode() == 'l') {
-            return qmlMode ? Lexer::T_FINAL : Lexer::T_IDENTIFIER;
+            return qmlMode ? int(Lexer::T_FINAL) : int(Lexer::T_IDENTIFIER);
           }
         }
       }
@@ -309,7 +309,7 @@ static inline int classify5(const QChar *s, bool qmlMode) {
       if (s[2].unicode() == 'o') {
         if (s[3].unicode() == 'a') {
           if (s[4].unicode() == 't') {
-            return qmlMode ? Lexer::T_FLOAT : Lexer::T_IDENTIFIER;
+            return qmlMode ? int(Lexer::T_FLOAT) : int(Lexer::T_IDENTIFIER);
           }
         }
       }
@@ -320,7 +320,7 @@ static inline int classify5(const QChar *s, bool qmlMode) {
       if (s[2].unicode() == 'o') {
         if (s[3].unicode() == 'r') {
           if (s[4].unicode() == 't') {
-            return qmlMode ? Lexer::T_SHORT : Lexer::T_IDENTIFIER;
+            return qmlMode ? int(Lexer::T_SHORT) : int(Lexer::T_IDENTIFIER);
           }
         }
       }
@@ -329,7 +329,7 @@ static inline int classify5(const QChar *s, bool qmlMode) {
       if (s[2].unicode() == 'p') {
         if (s[3].unicode() == 'e') {
           if (s[4].unicode() == 'r') {
-            return qmlMode ? Lexer::T_SUPER : Lexer::T_RESERVED_WORD;
+            return qmlMode ? int(Lexer::T_SUPER) : int(Lexer::T_RESERVED_WORD);
           }
         }
       }
@@ -378,7 +378,7 @@ static inline int classify6(const QChar *s, bool qmlMode) {
         if (s[3].unicode() == 'b') {
           if (s[4].unicode() == 'l') {
             if (s[5].unicode() == 'e') {
-              return qmlMode ? Lexer::T_DOUBLE : Lexer::T_IDENTIFIER;
+              return qmlMode ? int(Lexer::T_DOUBLE) : int(Lexer::T_IDENTIFIER);
             }
           }
         }
@@ -404,7 +404,7 @@ static inline int classify6(const QChar *s, bool qmlMode) {
         if (s[3].unicode() == 'o') {
           if (s[4].unicode() == 'r') {
             if (s[5].unicode() == 't') {
-              return qmlMode ? Lexer::T_IMPORT : Lexer::T_RESERVED_WORD;
+              return qmlMode ? int(Lexer::T_IMPORT) : int(Lexer::T_RESERVED_WORD);
             }
           }
         }
@@ -417,7 +417,7 @@ static inline int classify6(const QChar *s, bool qmlMode) {
         if (s[3].unicode() == 'i') {
           if (s[4].unicode() == 'v') {
             if (s[5].unicode() == 'e') {
-              return qmlMode ? Lexer::T_NATIVE : Lexer::T_IDENTIFIER;
+              return qmlMode ? int(Lexer::T_NATIVE) : int(Lexer::T_IDENTIFIER);
             }
           }
         }
@@ -467,7 +467,7 @@ static inline int classify6(const QChar *s, bool qmlMode) {
         if (s[3].unicode() == 't') {
           if (s[4].unicode() == 'i') {
             if (s[5].unicode() == 'c') {
-              return qmlMode ? Lexer::T_STATIC : Lexer::T_IDENTIFIER;
+              return qmlMode ? int(Lexer::T_STATIC) : int(Lexer::T_IDENTIFIER);
             }
           }
         }
@@ -491,7 +491,7 @@ static inline int classify6(const QChar *s, bool qmlMode) {
         if (s[3].unicode() == 'o') {
           if (s[4].unicode() == 'w') {
             if (s[5].unicode() == 's') {
-              return qmlMode ? Lexer::T_THROWS : Lexer::T_IDENTIFIER;
+              return qmlMode ? int(Lexer::T_THROWS) : int(Lexer::T_IDENTIFIER);
             }
           }
         }
@@ -520,7 +520,7 @@ static inline int classify7(const QChar *s, bool qmlMode) {
           if (s[4].unicode() == 'e') {
             if (s[5].unicode() == 'a') {
               if (s[6].unicode() == 'n') {
-                return qmlMode ? Lexer::T_BOOLEAN : Lexer::T_IDENTIFIER;
+                return qmlMode ? int(Lexer::T_BOOLEAN) : int(Lexer::T_IDENTIFIER);
               }
             }
           }
@@ -580,7 +580,7 @@ static inline int classify7(const QChar *s, bool qmlMode) {
           if (s[4].unicode() == 'a') {
             if (s[5].unicode() == 'g') {
               if (s[6].unicode() == 'e') {
-                return qmlMode ? Lexer::T_PACKAGE : Lexer::T_IDENTIFIER;
+                return qmlMode ? int(Lexer::T_PACKAGE) : int(Lexer::T_IDENTIFIER);
               }
             }
           }
@@ -593,7 +593,7 @@ static inline int classify7(const QChar *s, bool qmlMode) {
           if (s[4].unicode() == 'a') {
             if (s[5].unicode() == 't') {
               if (s[6].unicode() == 'e') {
-                return qmlMode ? Lexer::T_PRIVATE : Lexer::T_IDENTIFIER;
+                return qmlMode ? int(Lexer::T_PRIVATE) : int(Lexer::T_IDENTIFIER);
               }
             }
           }
@@ -613,7 +613,7 @@ static inline int classify8(const QChar *s, bool qmlMode) {
             if (s[5].unicode() == 'a') {
               if (s[6].unicode() == 'c') {
                 if (s[7].unicode() == 't') {
-                  return qmlMode ? Lexer::T_ABSTRACT : Lexer::T_IDENTIFIER;
+                  return qmlMode ? int(Lexer::T_ABSTRACT) : int(Lexer::T_IDENTIFIER);
                 }
               }
             }
@@ -715,7 +715,7 @@ static inline int classify8(const QChar *s, bool qmlMode) {
             if (s[5].unicode() == 'i') {
               if (s[6].unicode() == 'l') {
                 if (s[7].unicode() == 'e') {
-                  return qmlMode ? Lexer::T_VOLATILE : Lexer::T_IDENTIFIER;
+                  return qmlMode ? int(Lexer::T_VOLATILE) : int(Lexer::T_IDENTIFIER);
                 }
               }
             }
@@ -737,7 +737,7 @@ static inline int classify9(const QChar *s, bool qmlMode) {
               if (s[6].unicode() == 'a') {
                 if (s[7].unicode() == 'c') {
                   if (s[8].unicode() == 'e') {
-                    return qmlMode ? Lexer::T_INTERFACE : Lexer::T_IDENTIFIER;
+                    return qmlMode ? int(Lexer::T_INTERFACE) : int(Lexer::T_IDENTIFIER);
                   }
                 }
               }
@@ -756,7 +756,7 @@ static inline int classify9(const QChar *s, bool qmlMode) {
               if (s[6].unicode() == 't') {
                 if (s[7].unicode() == 'e') {
                   if (s[8].unicode() == 'd') {
-                    return qmlMode ? Lexer::T_PROTECTED : Lexer::T_IDENTIFIER;
+                    return qmlMode ? int(Lexer::T_PROTECTED) : int(Lexer::T_IDENTIFIER);
                   }
                 }
               }
@@ -775,7 +775,7 @@ static inline int classify9(const QChar *s, bool qmlMode) {
               if (s[6].unicode() == 'e') {
                 if (s[7].unicode() == 'n') {
                   if (s[8].unicode() == 't') {
-                    return qmlMode ? Lexer::T_TRANSIENT : Lexer::T_IDENTIFIER;
+                    return qmlMode ? int(Lexer::T_TRANSIENT) : int(Lexer::T_IDENTIFIER);
                   }
                 }
               }
@@ -799,7 +799,7 @@ static inline int classify10(const QChar *s, bool qmlMode) {
                 if (s[7].unicode() == 'n') {
                   if (s[8].unicode() == 't') {
                     if (s[9].unicode() == 's') {
-                      return qmlMode ? Lexer::T_IMPLEMENTS : Lexer::T_IDENTIFIER;
+                      return qmlMode ? int(Lexer::T_IMPLEMENTS) : int(Lexer::T_IDENTIFIER);
                     }
                   }
                 }
@@ -845,7 +845,7 @@ static inline int classify12(const QChar *s, bool qmlMode) {
                     if (s[9].unicode() == 'z') {
                       if (s[10].unicode() == 'e') {
                         if (s[11].unicode() == 'd') {
-                          return qmlMode ? Lexer::T_SYNCHRONIZED : Lexer::T_IDENTIFIER;
+                          return qmlMode ? int(Lexer::T_SYNCHRONIZED) : int(Lexer::T_IDENTIFIER);
                         }
                       }
                     }
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 234dee2918..276013e433 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -58,8 +58,6 @@
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qdebug.h>
 
-Q_DECLARE_METATYPE(QQmlV8Handle)
-
 QT_BEGIN_NAMESPACE
 
 static QQmlJavaScriptExpression::VTable QQmlBoundSignalExpression_jsvtable = {
diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp
index 0b22228034..06a91e39b3 100644
--- a/src/qml/qml/qqmlcompiler.cpp
+++ b/src/qml/qml/qqmlcompiler.cpp
@@ -76,7 +76,6 @@ Q_DECLARE_METATYPE(QList<qreal>)
 Q_DECLARE_METATYPE(QList<bool>)
 Q_DECLARE_METATYPE(QList<QString>)
 Q_DECLARE_METATYPE(QList<QUrl>)
-Q_DECLARE_METATYPE(QJSValue)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 2a46cdb12e..d7b6f706d6 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -675,13 +675,13 @@ void QQmlEnginePrivate::init()
         firstTime = false;
     }
 
-    qRegisterMetaType<QVariant>("QVariant");
-    qRegisterMetaType<QQmlScriptString>("QQmlScriptString");
-    qRegisterMetaType<QJSValue>("QJSValue");
-    qRegisterMetaType<QQmlComponent::Status>("QQmlComponent::Status");
-    qRegisterMetaType<QList<QObject*> >("QList<QObject*>");
-    qRegisterMetaType<QList<int> >("QList<int>");
-    qRegisterMetaType<QQmlV8Handle>("QQmlV8Handle");
+    qRegisterMetaType<QVariant>();
+    qRegisterMetaType<QQmlScriptString>();
+    qRegisterMetaType<QJSValue>();
+    qRegisterMetaType<QQmlComponent::Status>();
+    qRegisterMetaType<QList<QObject*> >();
+    qRegisterMetaType<QList<int> >();
+    qRegisterMetaType<QQmlV8Handle>();
 
     v8engine()->setEngine(q);
 
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 7a2f4eaf34..adce26b76c 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -986,6 +986,7 @@ QQmlImportNamespace::Import *QQmlImportsPrivate::addImportToNamespace(QQmlImport
 {
     Q_ASSERT(nameSpace);
     Q_ASSERT(errors);
+    Q_UNUSED(errors);
     Q_ASSERT(url.isEmpty() || url.endsWith(Slash));
 
     QQmlImportNamespace::Import *import = new QQmlImportNamespace::Import;
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index a2bd3742aa..62539b71e9 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -64,7 +64,6 @@
 
 #include <math.h>
 
-Q_DECLARE_METATYPE(QJSValue)
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<qreal>)
 Q_DECLARE_METATYPE(QList<bool>)
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index 8b023855ab..9922a82c3d 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -61,9 +61,6 @@
 #  pragma warning( disable : 4200 )
 #endif
 
-Q_DECLARE_METATYPE(QJSValue)
-Q_DECLARE_METATYPE(QQmlV8Handle);
-
 QT_BEGIN_NAMESPACE
 
 #define Q_INT16_MAX 32767
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp
index da918c3c71..9db3ee5a4d 100644
--- a/src/qml/qml/qqmlvme.cpp
+++ b/src/qml/qml/qqmlvme.cpp
@@ -1244,6 +1244,7 @@ v8::Persistent<v8::Object> QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptD
         script->initialize(parentCtxt->engine);
 
     v8::Local<v8::Object> qmlglobal = v8engine->qmlScope(ctxt, 0);
+    v8engine->contextWrapper()->takeContextOwnership(qmlglobal);
 
     if (!script->m_program.IsEmpty()) {
         script->m_program->Run(qmlglobal);
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 14d25b6a5e..8dc9943ddc 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -53,8 +53,6 @@
 #include <private/qv8variantresource_p.h>
 #include <private/qqmlglobal_p.h>
 
-Q_DECLARE_METATYPE(QJSValue);
-
 QT_BEGIN_NAMESPACE
 
 QQmlVMEVariantQObjectPtr::QQmlVMEVariantQObjectPtr(bool isVar)
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp
index 84bdbfda7a..48b2ad948a 100644
--- a/src/qml/qml/v4/qv4bindings.cpp
+++ b/src/qml/qml/v4/qv4bindings.cpp
@@ -68,8 +68,6 @@
 #include <QtCore/qmath.h>
 #include <math.h> // ::fmod
 
-Q_DECLARE_METATYPE(QJSValue)
-
 #ifdef Q_CC_MSVC
 // MSVC2010 warns about 'unreferenced formal parameter', even if it's used in p->~T()
 #  pragma warning( disable : 4100 )
diff --git a/src/qml/qml/v4/qv4compiler.cpp b/src/qml/qml/v4/qv4compiler.cpp
index 2b01acbddf..c12d59d420 100644
--- a/src/qml/qml/v4/qv4compiler.cpp
+++ b/src/qml/qml/v4/qv4compiler.cpp
@@ -50,8 +50,6 @@
 #include <private/qqmlaccessors_p.h>
 #include <private/qqmljsengine_p.h>
 
-Q_DECLARE_METATYPE(QJSValue)
-
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(bindingsDump, QML_BINDINGS_DUMP)
diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp
index bd875c185e..6e18091d6b 100644
--- a/src/qml/qml/v4/qv4irbuilder.cpp
+++ b/src/qml/qml/v4/qv4irbuilder.cpp
@@ -48,8 +48,6 @@
 
 DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER)
 
-Q_DECLARE_METATYPE(QJSValue)
-
 QT_BEGIN_NAMESPACE
 
 using namespace QQmlJS;
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp
index 5bb6db16e0..9698ed5e8a 100644
--- a/src/qml/qml/v8/qjsengine.cpp
+++ b/src/qml/qml/v8/qjsengine.cpp
@@ -68,7 +68,6 @@
 #define Q_D(blah)
 #define Q_Q(blah)
 
-Q_DECLARE_METATYPE(QJSValue)
 Q_DECLARE_METATYPE(QObjectList)
 Q_DECLARE_METATYPE(QList<int>)
 
diff --git a/src/qml/qml/v8/qjsvalue.h b/src/qml/qml/v8/qjsvalue.h
index 9223e57ee4..d13be2b8cc 100644
--- a/src/qml/qml/v8/qjsvalue.h
+++ b/src/qml/qml/v8/qjsvalue.h
@@ -155,6 +155,8 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QJSValue)
+
 QT_END_HEADER
 
 #endif
diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp
index 9f18afc5cb..bc64189cbd 100644
--- a/src/qml/qml/v8/qv8contextwrapper.cpp
+++ b/src/qml/qml/v8/qv8contextwrapper.cpp
@@ -55,7 +55,7 @@ class QV8ContextResource : public QV8ObjectResource
     V8_RESOURCE_TYPE(ContextType);
 
 public:
-    QV8ContextResource(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject);
+    QV8ContextResource(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false);
     ~QV8ContextResource();
 
     inline QQmlContextData *getContext() const;
@@ -64,7 +64,8 @@ public:
     quint32 isSharedContext:1;
     quint32 hasSubContexts:1;
     quint32 readOnly:1;
-    quint32 dummy:29;
+    quint32 ownsContext:1;
+    quint32 dummy:28;
 
     // This is a pretty horrible hack, and an abuse of external strings.  When we create a 
     // sub-context (a context created by a Qt.include() in an external javascript file),
@@ -86,15 +87,15 @@ private:
 
 };
 
-QV8ContextResource::QV8ContextResource(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject)
-: QV8ObjectResource(engine), isSharedContext(false), hasSubContexts(false), readOnly(true), 
-  context(context), scopeObject(scopeObject)
+QV8ContextResource::QV8ContextResource(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext)
+: QV8ObjectResource(engine), isSharedContext(false), hasSubContexts(false), readOnly(true),
+  ownsContext(ownsContext), context(context), scopeObject(scopeObject)
 {
 }
 
 QV8ContextResource::~QV8ContextResource()
 {
-    if (context && context->isJSContext)
+    if (context && ownsContext)
         context->destroy();
 }
 
@@ -186,7 +187,7 @@ v8::Local<v8::Object> QV8ContextWrapper::urlScope(const QUrl &url)
 
     // XXX NewInstance() should be optimized
     v8::Local<v8::Object> rv = m_urlConstructor->NewInstance(); 
-    QV8ContextResource *r = new QV8ContextResource(m_engine, context, 0);
+    QV8ContextResource *r = new QV8ContextResource(m_engine, context, 0, true);
     rv->SetExternalResource(r);
     return rv;
 }
@@ -226,6 +227,12 @@ QQmlContextData *QV8ContextWrapper::context(v8::Handle<v8::Value> value)
     return r?r->getContext():0;
 }
 
+void QV8ContextWrapper::takeContextOwnership(v8::Handle<v8::Object> qmlglobal)
+{
+    QV8ContextResource *r = v8_resource_cast<QV8ContextResource>(qmlglobal);
+    r->ownsContext = true;
+}
+
 v8::Handle<v8::Value> QV8ContextWrapper::NullGetter(v8::Local<v8::String>,
                                                     const v8::AccessorInfo &)
 {
diff --git a/src/qml/qml/v8/qv8contextwrapper_p.h b/src/qml/qml/v8/qv8contextwrapper_p.h
index 1e62ea6480..43eeee05d3 100644
--- a/src/qml/qml/v8/qv8contextwrapper_p.h
+++ b/src/qml/qml/v8/qv8contextwrapper_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtCore/qglobal.h>
+#include <private/qtqmlglobal_p.h>
 #include <private/qv8_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +63,7 @@ class QUrl;
 class QObject;
 class QV8Engine;
 class QQmlContextData;
-class QV8ContextWrapper 
+class Q_QML_PRIVATE_EXPORT QV8ContextWrapper
 {
 public:
     QV8ContextWrapper();
@@ -84,6 +85,8 @@ public:
 
     inline v8::Handle<v8::Object> sharedContext() const;
 
+    void takeContextOwnership(v8::Handle<v8::Object> qmlglobal);
+
 private:
     static v8::Handle<v8::Value> NullGetter(v8::Local<v8::String> property, 
                                             const v8::AccessorInfo &info);
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 1544b0717b..806e3690b3 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -63,7 +63,6 @@
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qjsonvalue.h>
 
-Q_DECLARE_METATYPE(QJSValue)
 Q_DECLARE_METATYPE(QList<int>)
 
 
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 12b0f4b6a1..75e4344fee 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -642,4 +642,6 @@ QV8Engine::Deletable *QV8Engine::extensionData(int index) const
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QQmlV8Handle)
+
 #endif // QQMLV8ENGINE_P_H
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index fa818388fe..eac8c93c08 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -62,9 +62,6 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qatomic.h>
 
-Q_DECLARE_METATYPE(QJSValue);
-Q_DECLARE_METATYPE(QQmlV8Handle);
-
 QT_BEGIN_NAMESPACE
 
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index 3fa9561a9d..9ed792748c 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -1,10 +1,14 @@
 TARGET     = QtQuickTest
-CONFIG += dll warn_on
 
 DEFINES += QT_NO_URL_CAST_FROM_STRING
 QT = core
 QT_PRIVATE = testlib-private quick qml-private v8-private gui core-private
 
+!contains(QT_CONFIG, no-widgets) {
+    QT += widgets
+    DEFINES += QT_QMLTEST_WITH_WIDGETS
+}
+
 load(qt_module)
 
 # Install qmltestcase.prf into the Qt mkspecs so that "CONFIG += qmltestcase"
@@ -24,4 +28,4 @@ HEADERS += \
     $$PWD/quicktestresult_p.h \
     $$PWD/qtestoptions_p.h
 
-DEFINES += QT_QML_DEBUG_NO_WARNING
\ No newline at end of file
+DEFINES += QT_QML_DEBUG_NO_WARNING
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 6be10add38..705908c3c4 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -64,6 +64,10 @@
 #include <QtCore/QTranslator>
 #include <QtTest/QSignalSpy>
 
+#ifdef QT_QMLTEST_WITH_WIDGETS
+#include <QtWidgets/QApplication>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QTestRootObject : public QObject
@@ -167,11 +171,6 @@ bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000)
 
 int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir)
 {
-    QGuiApplication* app = 0;
-    if (!QCoreApplication::instance()) {
-        app = new QGuiApplication(argc, argv);
-    }
-
     // Look for QML-specific command-line options.
     //      -import dir         Specify an import directory.
     //      -input dir          Specify the input directory for test cases.
@@ -179,6 +178,9 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
     QStringList imports;
     QString testPath;
     QString translationFile;
+#ifdef QT_QMLTEST_WITH_WIDGETS
+    bool withWidgets = false;
+#endif
     int outargc = 1;
     int index = 1;
     while (index < argc) {
@@ -190,6 +192,11 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
             index += 2;
         } else if (strcmp(argv[index], "-opengl") == 0) {
             ++index;
+#ifdef QT_QMLTEST_WITH_WIDGETS
+        } else if (strcmp(argv[index], "-widgets") == 0) {
+            withWidgets = true;
+            ++index;
+#endif
         } else if (strcmp(argv[index], "-translation") == 0 && (index + 1) < argc) {
             translationFile = stripQuotes(QString::fromLocal8Bit(argv[index + 1]));
             index += 2;
@@ -203,6 +210,18 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
     argv[outargc] = 0;
     argc = outargc;
 
+    QCoreApplication* app = 0;
+    if (!QCoreApplication::instance()) {
+#ifdef QT_QMLTEST_WITH_WIDGETS
+        if (withWidgets)
+            app = new QApplication(argc, argv);
+        else
+#endif
+        {
+            app = new QGuiApplication(argc, argv);
+        }
+    }
+
     // Parse the command-line arguments.
 
     // Setting currentAppname and currentTestObjectName (via setProgramName) are needed
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp
index 2fccf3cd72..20ede936fa 100644
--- a/src/qmltest/quicktestevent.cpp
+++ b/src/qmltest/quicktestevent.cpp
@@ -146,6 +146,7 @@ namespace QtQuickTest
         }
     }
 
+#ifndef QT_NO_WHEELEVENT
     static void mouseWheel(QWindow* window, QObject* item, Qt::MouseButtons buttons,
                                 Qt::KeyboardModifiers stateKey,
                                 QPointF _pos, int xDelta, int yDelta, int delay = -1)
@@ -172,6 +173,7 @@ namespace QtQuickTest
         if (!qApp->notify(window, &we))
             QTest::qWarn("Wheel event not accepted by receiving window");
     }
+#endif
 };
 
 bool QuickTestEvent::mousePress
@@ -188,6 +190,7 @@ bool QuickTestEvent::mousePress
     return true;
 }
 
+#ifndef QT_NO_WHEELEVENT
 bool QuickTestEvent::mouseWheel(
     QObject *item, qreal x, qreal y, int buttons,
     int modifiers, int xDelta, int yDelta, int delay)
@@ -200,6 +203,7 @@ bool QuickTestEvent::mouseWheel(
                             QPointF(x, y), xDelta, yDelta, delay);
     return true;
 }
+#endif
 
 bool QuickTestEvent::mouseRelease
     (QObject *item, qreal x, qreal y, int button,
diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h
index 9dfa66a54d..f72d9265b5 100644
--- a/src/qmltest/quicktestevent_p.h
+++ b/src/qmltest/quicktestevent_p.h
@@ -69,8 +69,10 @@ public Q_SLOTS:
                           int modifiers, int delay);
     bool mouseMove(QObject *item, qreal x, qreal y, int delay, int buttons);
 
+#ifndef QT_NO_WHEELEVENT
     bool mouseWheel(QObject *item, qreal x, qreal y, int buttons,
                int modifiers, int xDelta, int yDelta, int delay);
+#endif
 
 private:
     QWindow *eventWindow();
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 93aad5ddbf..f75ae06539 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -3,35 +3,37 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtQuick
 description             = Qt Quick Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtquick-index.html
-version                 = 5.0.0
+version                 = 5.0.1
 
 
 qhp.projects            = QtQuick
 
 qhp.QtQuick.file                = qtquick.qhp
 qhp.QtQuick.namespace           = org.qt-project.qtquick.500
-qhp.QtQuick.virtualFolder       = qdoc
-qhp.QtQuick.indexTitle          = Qt Quick Reference Documentation
+qhp.QtQuick.virtualFolder       = qtquick
+qhp.QtQuick.indexTitle          = Qt Quick
 qhp.QtQuick.indexRoot           =
 
-qhp.QtQuick.filterAttributes    = qtquick 5.0.0 qtrefdoc
-qhp.QtQuick.customFilters.Qt.name = QtQuick 5.0.0
-qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick 5.0.0
-qhp.QtQuick.subprojects         = classes overviews examples
+qhp.QtQuick.filterAttributes    = qtquick 5.0.1 qtrefdoc
+qhp.QtQuick.customFilters.Qt.name = QtQuick 5.0.1
+qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick 5.0.1
+qhp.QtQuick.subprojects         = qmltypes classes examples
+qhp.QtQuick.subprojects.qmltypes.title = QML Types
+qhp.QtQuick.subprojects.qmltypes.indexTitle = Qt Quick QML Types
+qhp.QtQuick.subprojects.qmltypes.selectors = class fake:headerfile
+qhp.QtQuick.subprojects.qmltypes.sortPages = true
 qhp.QtQuick.subprojects.classes.title = Classes
-qhp.QtQuick.subprojects.classes.indexTitle = Qt Quick's Classes
+qhp.QtQuick.subprojects.classes.title = C++ Classes
+qhp.QtQuick.subprojects.classes.indexTitle = Qt Quick Module C++ Classes
 qhp.QtQuick.subprojects.classes.selectors = class fake:headerfile
 qhp.QtQuick.subprojects.classes.sortPages = true
-qhp.QtQuick.subprojects.overviews.title = Overviews
-qhp.QtQuick.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtQuick.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtQuick.subprojects.examples.title = Qt Quick Examples
-qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Examples
+qhp.QtQuick.subprojects.examples.title = Examples
+qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Code Samples
 qhp.QtQuick.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtquick/qtquick.tags
 
-depends += qtcore qtxmlpatterns qtqml qtgui
+depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist
 
 headerdirs  += ..
 
@@ -43,10 +45,6 @@ exampledirs +=  ../../../examples/ \
 
 imagedirs   += images
 
-#add qml sources because of dependencies
-headerdirs += ../../qml
-exampledirs += ../../qml
-imagedirs += ../../qml
 
 #add particles sources
 headerdirs += ../../particles
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index f5b3e8b7db..dbd13fff07 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -59,7 +59,7 @@ Tutorial chapters:
 \li \l {tutorials/samegame/samegame4}{Finishing Touches}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/tutorials/samegame
+All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/samegame
 directory.
 */
 
@@ -364,12 +364,12 @@ To fade out, we set \c dying to true instead of setting opacity to 0 when a bloc
 
 \section3 Adding particle effects
 
-Finally, we'll add a cool-looking particle effect to the blocks when they are destroyed. To do this, we first add a \l Particles element in
+Finally, we'll add a cool-looking particle effect to the blocks when they are destroyed. To do this, we first add a \l ParticleSystem in
 \c BoomBlock.qml, like so:
 
 \snippet tutorials/samegame/samegame4/content/BoomBlock.qml 3
 
-To fully understand this you should read the \l Particles documentation, but it's important to note that \c emissionRate is set
+To fully understand this you should read the \l Particles documentation, but it's important to note that \c emitRate is set
 to zero so that particles are not emitted normally.
 Also, we extend the \c dying State, which creates a burst of particles by calling the \c burst() method on the particles element. The code for the states now look
 like this:
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index 6bb2a75074..305524c9e6 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \page qtquick-porting-qt5.html
-\title QML Applications in Qt 5
+\title Porting QML Applications to Qt 5
 \brief Lists the Qt 5.0 changes that affect the existing QML applications
 
 When porting QML-related code from Qt 4.8 to Qt 5, application developers should be aware that
@@ -38,6 +38,15 @@ This article describes the changes that affect your existing code. If you are
 interested in the summary of all new features in Qt 5 for QML application development, see
 \l{qtqml-releasenotes.html}{QtQml Release Notes} and \l{qtquick-releasenotes.html}{QtQuick Release Notes}.
 
+\section1 QML Language changes
+
+There are very few changes in the QML language which affect the porting of existing Qt 4.8 QML code to Qt 5. These are:
+
+\list
+\li Individual file imports no longer work (e.g. import "MyType.qml"). Import the containing directory instead.
+\li Relative file paths in JavaScript files are now resolved relative to the location of the JavaScript file instead of the QML file that imported it.
+\endlist
+
 \section1 QtQuick Module
 
 The QtQuick module has been updated to version 2.0. All QML applications should update their import
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
index e9add7b221..d9bfee2638 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
@@ -121,7 +121,7 @@ QAbstractItemModel::setRoleNames(). The default role names set by Qt are:
 \endtable
 
 Here is an application with a QAbstractListModel subclass named \c AnimalModel
-that has \e type and \e size roles. It calls QAbstractItemModel::setRoleNames() to set the
+that has \e type and \e size roles. It reimplements QAbstractItemModel::roleNames() to set the
 role names for accessing the properties via QML:
 
 \snippet examples/quick/modelviews/abstractitemmodel/model.h 0
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index ca8a045975..6e9d963d8d 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -49,18 +49,18 @@ are drawn in one call, then all icons, then all the text, reducing the
 total amount of draw calls to only 3. Batching and state change
 reduction like this can greatly improve performance on some hardware.
 
-The scene graph is closely tied to QML and can not be used as
+The scene graph is closely tied to Qt Quick 2.0 and can not be used
 stand-alone. The scene graph is managed and rendered by the
-QQuickWindow class and custom QML elements will add their graphical
+QQuickWindow class and custom Item elements can add their graphical
 primitives into the scene graph through a call to
 QQuickItem::updatePaintNode().
 
-The QML scene graph is a graphical representation of the QML scene. It
-can be thought of as a graphical deep copy, an independent structure that
-contains enough information to render the QML Scene. Once it has been set
-up, it can be manipulated and rendered independently of the state of
-the QML scene. On some platforms, the scene graph will even be
-rendered on a dedicated render thread.
+The scene graph is a graphical representation of the Item scene, an
+independent structure that contains enough information to render all
+the items. Once it has been set up, it can be manipulated and rendered
+independently of the state of the items. On many platforms, the scene
+graph will even be rendered on a dedicated render thread while the GUI
+thread is preparing the next frame's state.
 
 
 
@@ -74,7 +74,7 @@ serving a dedicated purpose.
 \li QSGGeometryNode - for all rendered content in the scene
 graph. In most cases, it will be enough for a custom QQuickItem object to
 simply return a single QSGGeometryNode object from the
-QQuickItem::updatePaintNode() call.
+QQuickItem::updatePaintNode() call. 
 
 \li QSGTransformNode - implements transformations in the scene
 graph. Nested transforms are multiplied together.
@@ -91,6 +91,11 @@ the rendering, such as the shared root for a subtree of geometry nodes.
 
 \endlist
 
+Ownership of the nodes is either done explicitly by the creator or by
+the scene graph by setting the flag \l QSGNode::OwnedByParent on
+it. Assigning ownership to the scene graph is often preferable as it
+simplifies cleanup when the scene graph lives outside the GUI thread.
+
 
 
 \section1 Rendering
@@ -102,6 +107,40 @@ Rendering} section.
 How to integrate QPainter based graphics is explained in \l{Custom
 Items using QPainter}.
 
+\section1 Mixing Scene Graph and OpenGL
+
+The scene graph offers two methods for integrating OpenGL
+content. 
+
+By connecting to the \l QQuickWindow::beforeRendering() and \l
+QQuickWindow::afterRendering() signals, applications can make OpenGL
+calls directly into the same context as the scene graph is rendering
+to. As the signal names indicate, the user can then render OpenGL
+content either under a Qt Quick scene or over it. The benefit of
+integrating in this manner is that no extra framebuffer nor memory is
+needed to perform the rendering. The downside is that Qt Quick decides
+when to call the signals and this is the only time the OpenGL
+application is allowed to draw. 
+
+The other alternative is to create a FramebufferObject, render into it
+and use the result as a textured node in the scene graph, for instance
+using a QSGSimpleTextureNode. A simple way of doing the same is to use
+a QQuickPaintedItem with QQuickPaintedItem::FramebufferObject as
+render target and by calling QPainter::beginNativePainting() before
+the OpenGL rendering and QPainter::endNativePainting() after. When
+OpenGL content is integrated with a texture and FramebufferObject, the
+application has more control over when the content is rendered. For
+instance, the application can create a second QOpenGLContext on the
+GUI thread which shares memory with the scene graph's OpenGL context and drive the rendering manually.
+
+\warning When mixing OpenGL content with scene graph rendering, it is
+important the application does not leave the OpenGL context in a state
+with buffers bound, attributes enabled, special values in the z-buffer
+or stencil-buffer or similar. Doing so can result in unpredictable
+behavior.
+
+\warning The OpenGL rendering code must be thread aware, as the
+rendering might be happening outside the GUI thread. 
 
 
 \section1 Scene Graph Backend
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 0b5f2b4f60..3edfdc65c0 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -45,7 +45,7 @@ Tutorial chapters:
 \li \l {tutorials/dynamicview/dynamicview4}{Sorting Items}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/tutorials/dynamicview
+All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/dynamicview
 directory.
 */
 
@@ -139,7 +139,7 @@ so that is above other items in the stacking order and isn't obscured as it is d
 \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 \nextpage QML Dynamic View Ordering Tutorial 4 - Sorting Items
 
-\example examples/tutorials/dynamicview/dynamicview3
+\example examples/quick/tutorials/dynamicview/dynamicview3
 
 The next step in our application to move items within the list as they're dragged so that we
 can re-order the list.  To achieve this we introduce three new elements to our application;
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index c0b4968ce3..e64ee25dbb 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -56,13 +56,13 @@ information about the concepts which are central to \c QtQuick.
     Qt Quick includes several submodules which contain additional types.
 
     \list
-    \li \l{QML Module QtQuick.XmlListModel 2.0}{XML List Model} - contains types
+    \li \l{QtQuick.XmlListModel 2}{XML List Model} - contains types
     for creating models from XML data
-    \li \l{QML Module QtQuick.LocalStorage 2.0}{Local Storage} - a submodule
+    \li \l{QtQuick.LocalStorage 2}{Local Storage} - a submodule
     containing a JavaScript interface for an SQLite database
-    \li \l{QML Module QtQuick.Particles 2.0}{Particles} - provides a particle
+    \li \l{QtQuick.Particles 2}{Particles} - provides a particle
     system for QML applications
-    \li \l{QML Module QtQuick.Window 2.0}{Window} - contains types for creating
+    \li \l{QtQuick.Window 2}{Window} - contains types for creating
     top-level windows and accessing screen information
     \endlist
 
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index 67951b0abd..619f754696 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -41,7 +41,7 @@ with properties and signals, and we will create a simple animation with the help
 
 Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts.
 
-The tutorial's source code is located in the \c{examples/tutorials/helloworld} directory.
+The tutorial's source code is located in the \c{examples/quick/tutorials/helloworld} directory.
 
 Tutorial chapters:
 
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index 74f486ae7d..a11f40c535 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -127,6 +127,18 @@ public:
         return obj->setProperty(propertyName, value);
     }
 
+    static QObject *findAccessible(QObject *object, QAccessible::Role role = QAccessible::NoRole)
+    {
+        while (object) {
+            QObject *att = QQuickAccessibleAttached::attachedProperties(object);
+            if (att && (role == QAccessible::NoRole || att->property("role").toInt() == role)) {
+                break;
+            }
+            object = object->parent();
+        }
+        return object;
+    }
+
 
 Q_SIGNALS:
     void roleChanged();
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 0a3dcd8039..6e5e6b74a0 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1270,6 +1270,7 @@ void QQuickFlickable::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
+#ifndef QT_NO_WHEELEVENT
 void QQuickFlickable::wheelEvent(QWheelEvent *event)
 {
     Q_D(QQuickFlickable);
@@ -1324,6 +1325,7 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event)
     if (!event->isAccepted())
         QQuickItem::wheelEvent(event);
 }
+#endif
 
 bool QQuickFlickablePrivate::isInnermostPressDelay(QQuickItem *i) const
 {
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index d5f97ad963..ed4b026be3 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -234,7 +234,9 @@ protected:
     virtual void mousePressEvent(QMouseEvent *event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
+#ifndef QT_NO_WHEELEVENT
     virtual void wheelEvent(QWheelEvent *event);
+#endif
     virtual void timerEvent(QTimerEvent *event);
 
     QQuickFlickableVisibleArea *visibleArea();
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 2340da9b9f..6668cb72c5 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3129,8 +3129,12 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event)
 void QQuickItem::focusInEvent(QFocusEvent * /*event*/)
 {
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent ev(this, QAccessible::Focus);
-    QAccessible::updateAccessibility(&ev);
+    if (QAccessible::isActive()) {
+        if (QObject *acc = QQuickAccessibleAttached::findAccessible(this)) {
+            QAccessibleEvent ev(acc, QAccessible::Focus);
+            QAccessible::updateAccessibility(&ev);
+        }
+    }
 #endif
 }
 
@@ -3202,6 +3206,7 @@ void QQuickItem::touchUngrabEvent()
     // XXX todo
 }
 
+#ifndef QT_NO_WHEELEVENT
 /*!
     This event handler can be reimplemented in a subclass to receive
     wheel events for an item. The event information is provided by the
@@ -3211,6 +3216,7 @@ void QQuickItem::wheelEvent(QWheelEvent *event)
 {
     event->ignore();
 }
+#endif
 
 /*!
     This event handler can be reimplemented in a subclass to receive touch
@@ -4100,11 +4106,13 @@ void QQuickItemPrivate::deliverMouseEvent(QMouseEvent *e)
     }
 }
 
+#ifndef QT_NO_WHEELEVENT
 void QQuickItemPrivate::deliverWheelEvent(QWheelEvent *e)
 {
     Q_Q(QQuickItem);
     q->wheelEvent(e);
 }
+#endif
 
 void QQuickItemPrivate::deliverTouchEvent(QTouchEvent *e)
 {
@@ -5264,7 +5272,7 @@ void QQuickItem::setFlags(Flags flags)
 {
     Q_D(QQuickItem);
 
-    if ((flags & ItemIsFocusScope) != (d->flags & ItemIsFocusScope)) {
+    if (int(flags & ItemIsFocusScope) != int(d->flags & ItemIsFocusScope)) {
         if (flags & ItemIsFocusScope && !d->childItems.isEmpty() && d->window) {
             qWarning("QQuickItem: Cannot set FocusScope once item has children and is in a window.");
             flags &= ~ItemIsFocusScope;
@@ -5274,7 +5282,7 @@ void QQuickItem::setFlags(Flags flags)
         }
     }
 
-    if ((flags & ItemClipsChildrenToShape ) != (d->flags & ItemClipsChildrenToShape))
+    if (int(flags & ItemClipsChildrenToShape) != int(d->flags & ItemClipsChildrenToShape))
         d->dirty(QQuickItemPrivate::Clip);
 
     d->flags = flags;
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index bba26be060..dc20310c48 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -398,7 +398,9 @@ protected:
     virtual void mouseDoubleClickEvent(QMouseEvent *event);
     virtual void mouseUngrabEvent(); // XXX todo - params?
     virtual void touchUngrabEvent();
+#ifndef QT_NO_WHEELEVENT
     virtual void wheelEvent(QWheelEvent *event);
+#endif
     virtual void touchEvent(QTouchEvent *event);
     virtual void hoverEnterEvent(QHoverEvent *event);
     virtual void hoverMoveEvent(QHoverEvent *event);
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 363cc93cc4..804b10deac 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -528,7 +528,9 @@ public:
 #endif
     void deliverFocusEvent(QFocusEvent *);
     void deliverMouseEvent(QMouseEvent *);
+#ifndef QT_NO_WHEELEVENT
     void deliverWheelEvent(QWheelEvent *);
+#endif
     void deliverTouchEvent(QTouchEvent *);
     void deliverHoverEvent(QHoverEvent *);
 #ifndef QT_NO_DRAGANDDROP
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index ad3f4fa215..0edbd1b9a9 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -64,7 +64,7 @@ static const int PressAndHoldDelay = 800;
 #ifndef QT_NO_DRAGANDDROP
 
 QQuickDrag::QQuickDrag(QObject *parent)
-: QObject(parent), _target(0), _axis(XandYAxis), _xmin(-FLT_MAX),
+: QObject(parent), _target(0), _axis(XAndYAxis), _xmin(-FLT_MAX),
 _xmax(FLT_MAX), _ymin(-FLT_MAX), _ymax(FLT_MAX), _active(false), _filterChildren(false)
 {
 }
@@ -938,6 +938,7 @@ void QQuickMouseArea::hoverLeaveEvent(QHoverEvent *event)
         setHovered(false);
 }
 
+#ifndef QT_NO_WHEELEVENT
 void QQuickMouseArea::wheelEvent(QWheelEvent *event)
 {
     Q_D(QQuickMouseArea);
@@ -953,6 +954,7 @@ void QQuickMouseArea::wheelEvent(QWheelEvent *event)
     if (!we.isAccepted())
         QQuickItem::wheelEvent(event);
 }
+#endif
 
 void QQuickMouseArea::ungrabMouse()
 {
@@ -1331,7 +1333,7 @@ void QQuickMouseArea::setCursorShape(Qt::CursorShape shape)
     \list
     \li \c drag.target specifies the id of the item to drag.
     \li \c drag.active specifies if the target item is currently being dragged.
-    \li \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XandYAxis)
+    \li \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XAndYAxis)
     \li \c drag.minimum and \c drag.maximum limit how far the target can be dragged along the corresponding axes.
     \endlist
 
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index b095ba5e23..c2138792ae 100644
--- a/src/quick/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -78,7 +78,7 @@ public:
     void setTarget(QQuickItem *target);
     void resetTarget();
 
-    enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
+    enum Axis { XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis };
     Axis axis() const;
     void setAxis(Axis);
 
@@ -222,7 +222,9 @@ protected:
     virtual void hoverEnterEvent(QHoverEvent *event);
     virtual void hoverMoveEvent(QHoverEvent *event);
     virtual void hoverLeaveEvent(QHoverEvent *event);
+#ifndef QT_NO_WHEELEVENT
     virtual void wheelEvent(QWheelEvent *event);
+#endif
     virtual bool childMouseEventFilter(QQuickItem *i, QEvent *e);
     virtual void timerEvent(QTimerEvent *event);
     virtual void windowDeactivateEvent();
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 5dcea62281..a2f0376466 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -239,7 +239,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
     \li \c pinch.active specifies if the target item is currently being dragged.
     \li \c pinch.minimumScale and \c pinch.maximumScale limit the range of the Item::scale property.
     \li \c pinch.minimumRotation and \c pinch.maximumRotation limit the range of the Item::rotation property.
-    \li \c pinch.dragAxis specifies whether dragging in not allowed (\c Pinch.NoDrag), can be done horizontally (\c Pinch.XAxis), vertically (\c Pinch.YAxis), or both (\c Pinch.XandYAxis)
+    \li \c pinch.dragAxis specifies whether dragging in not allowed (\c Pinch.NoDrag), can be done horizontally (\c Pinch.XAxis), vertically (\c Pinch.YAxis), or both (\c Pinch.XAndYAxis)
     \li \c pinch.minimum and \c pinch.maximum limit how far the target can be dragged along the corresponding axes.
     \endlist
 */
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 435d3ec538..f3687e0c15 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -112,7 +112,7 @@ public:
         emit maximumRotationChanged();
     }
 
-    enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
+    enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis };
     Axis axis() const { return m_axis; }
     void setAxis(Axis a) {
         if (a == m_axis)
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 622000e492..15989db57b 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -153,7 +153,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri
                 if (state.isMatrixDirty())
                     program()->setUniformValue(loc, state.combinedMatrix());
             } else if (d.specialType == UniformData::None) {
-                switch (d.value.type()) {
+                switch (int(d.value.type())) {
                 case QMetaType::QColor:
                     program()->setUniformValue(loc, qt_premultiply_color(qvariant_cast<QColor>(d.value)));
                     break;
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 2b613df0f2..0c4e263ac2 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -695,6 +695,7 @@ void QQuickShaderEffectSource::setSourceItem(QQuickItem *item)
 void QQuickShaderEffectSource::sourceItemDestroyed(QObject *item)
 {
     Q_ASSERT(item == m_sourceItem);
+    Q_UNUSED(item);
     m_sourceItem = 0;
     update();
     emit sourceItemChanged();
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index fee49593ee..6dd8fb157d 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -59,6 +59,7 @@
 
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
+#include "qquickaccessibleattached_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -3374,9 +3375,11 @@ void QQuickTextInputPrivate::internalSetText(const QString &txt, int pos, bool e
 #ifdef QT_NO_ACCESSIBILITY
     Q_UNUSED(changed)
 #else
-    if (changed) {
-        QAccessibleTextUpdateEvent ev(q, 0, oldText, m_text);
-        QAccessible::updateAccessibility(&ev);
+    if (changed && QAccessible::isActive()) {
+        if (QObject *acc = QQuickAccessibleAttached::findAccessible(q, QAccessible::EditableText)) {
+            QAccessibleTextUpdateEvent ev(acc, 0, oldText, m_text);
+            QAccessible::updateAccessibility(&ev);
+        }
     }
 #endif
 }
@@ -4025,8 +4028,12 @@ bool QQuickTextInputPrivate::emitCursorPositionChanged()
         }
 
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleTextCursorEvent ev(q, m_cursor);
-        QAccessible::updateAccessibility(&ev);
+        if (QAccessible::isActive()) {
+            if (QObject *acc = QQuickAccessibleAttached::findAccessible(q, QAccessible::EditableText)) {
+                QAccessibleTextCursorEvent ev(acc, m_cursor);
+                QAccessible::updateAccessibility(&ev);
+            }
+        }
 #endif
 
         return true;
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index a915430616..2cde3cc434 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1421,6 +1421,7 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce
     return false;
 }
 
+#ifndef QT_NO_WHEELEVENT
 bool QQuickWindowPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event)
 {
     Q_Q(QQuickWindow);
@@ -1457,7 +1458,6 @@ bool QQuickWindowPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
     return false;
 }
 
-#ifndef QT_NO_WHEELEVENT
 /*! \reimp */
 void QQuickWindow::wheelEvent(QWheelEvent *event)
 {
@@ -2058,9 +2058,11 @@ bool QQuickWindow::sendEvent(QQuickItem *item, QEvent *e)
             item->mouseUngrabEvent();
         }
         break;
+#ifndef QT_NO_WHEELEVENT
     case QEvent::Wheel:
         QQuickItemPrivate::get(item)->deliverWheelEvent(static_cast<QWheelEvent *>(e));
         break;
+#endif
     case QEvent::HoverEnter:
     case QEvent::HoverLeave:
     case QEvent::HoverMove:
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index fdf5fe2abb..c8ecd43238 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -131,7 +131,9 @@ public:
     bool deliverInitialMousePressEvent(QQuickItem *, QMouseEvent *);
     bool deliverMouseEvent(QMouseEvent *);
     bool sendFilteredMouseEvent(QQuickItem *, QQuickItem *, QEvent *);
+#ifndef QT_NO_WHEELEVENT
     bool deliverWheelEvent(QQuickItem *, QWheelEvent *);
+#endif
     bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *,
             QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *);
     bool deliverTouchEvent(QTouchEvent *);
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index 5da904ace2..1249468a4d 100644
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -253,7 +253,7 @@ void QQuickTrivialWindowManager::renderWindow(QQuickWindow *window)
     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
     cd->polishItems();
 
-    int renderTime, syncTime;
+    int renderTime = 0, syncTime = 0;
     QTime renderTimer;
     if (qquick_render_timing())
         renderTimer.start();
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 3eece29152..c4fceac33d 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -1,7 +1,5 @@
 TARGET = QtQuick
 
-CONFIG += dll warn_on
-
 QT = core-private gui-private qml-private
 QT_PRIVATE = v8-private network
 
diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
index 85564590df..86f43a5830 100644
--- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@ -69,7 +69,7 @@ static bool nodeLessThan(QSGNode *nodeA, QSGNode *nodeB)
     if (nodeA->type() != QSGNode::GeometryNodeType)
         return nodeA < nodeB;
     QSGGeometryNode *a = static_cast<QSGGeometryNode *>(nodeA);
-    QSGGeometryNode *b = static_cast<QSGGeometryNode *>(nodeA);
+    QSGGeometryNode *b = static_cast<QSGGeometryNode *>(nodeB);
 
     // Sort by clip...
     if (a->clipList() != b->clipList())
@@ -97,7 +97,7 @@ static bool nodeLessThanWithRenderOrder(QSGNode *nodeA, QSGNode *nodeB)
     if (nodeA->type() != QSGNode::GeometryNodeType)
         return nodeA < nodeB;
     QSGGeometryNode *a = static_cast<QSGGeometryNode *>(nodeA);
-    QSGGeometryNode *b = static_cast<QSGGeometryNode *>(nodeA);
+    QSGGeometryNode *b = static_cast<QSGGeometryNode *>(nodeB);
 
     // Sort by clip...
     if (a->clipList() != b->clipList())
diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index d9c04e1959..da2dfcda64 100644
--- a/src/quick/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -305,8 +305,8 @@ void QSGDefaultImageNode::setTexture(QSGTexture *texture)
     m_materialO.setTexture(texture);
     m_smoothMaterial.setTexture(texture);
     // Texture cleanup
-//    if (!texture.isNull())
-//        m_material.setBlending(texture->hasAlphaChannel());
+    if (texture)
+        m_material.setFlag(QSGMaterial::Blending, texture->hasAlphaChannel());
     markDirty(DirtyMaterial);
 
     // Because the texture can be a different part of the atlas, we need to update it...
@@ -355,12 +355,11 @@ void QSGDefaultImageNode::preprocess()
         doDirty = t->updateTexture();
         updateGeometry();
     }
-// ### texture cleanup
-//    bool alpha = m_material.blending();
-//    if (!m_material->texture().isNull() && alpha != m_material.texture()->hasAlphaChannel()) {
-//        m_material.setBlending(!alpha);
-//        doDirty = true;
-//    }
+    bool alpha = m_material.flags() & QSGMaterial::Blending;
+    if (m_material.texture() && alpha != m_material.texture()->hasAlphaChannel()) {
+        m_material.setFlag(QSGMaterial::Blending, !alpha);
+        doDirty = true;
+    }
 
     if (doDirty)
         markDirty(DirtyMaterial);
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index e4a82ca091..71efda5846 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -67,6 +67,7 @@ void QQuickAnimationControllerPrivate::animationFinished(QAbstractAnimationJob *
 {
     Q_Q(QQuickAnimationController);
     Q_ASSERT(animationInstance && animationInstance == job);
+    Q_UNUSED(job);
 
     animationInstance->removeAnimationChangeListener(this, QAbstractAnimationJob::Completion | QAbstractAnimationJob::CurrentTime);
 
@@ -84,6 +85,7 @@ void QQuickAnimationControllerPrivate::animationCurrentTimeChanged(QAbstractAnim
 {
     Q_Q(QQuickAnimationController);
     Q_ASSERT(animationInstance && animationInstance == job);
+    Q_UNUSED(job);
     const qreal newProgress = currentTime * 1.0 / animationInstance->duration();
     if (progress != newProgress) {
         progress = newProgress;
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index e8942a7089..6d2f74a6bc 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,9 +1,4 @@
-QT = core testlib qml qml quick qmltest qmldevtools gui-private
-HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri
-isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) {
-    warning("headersclean.pri from QtCore sources not available.  test disabled")
-    TEMPLATE=subdirs
-}
-
+QT = qml quick qmltest qmldevtools
+load(qt_headersclean)
 # shadowing problems in scenegraph, allow it for now
 *-g++*: QMAKE_CXXFLAGS -= -Wshadow
diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h
deleted file mode 100644
index 25c030ca26..0000000000
--- a/tests/auto/headersclean/qt_headersclean_headers.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** 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, Digia gives you certain additional
-** rights.  These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT_HEADERSCLEAN_HEADERS
-#define QT_HEADERSCLEAN_HEADERS
-
-#include <QtQml/QtQml>
-#include <QtQmlDevTools/QtQmlDevTools>
-#include <QtQuick/QtQuick>
-#include <QtQuickTest/QtQuickTest>
-
-#endif
diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
index 5848b42028..92f48f398f 100644
--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
@@ -85,7 +85,7 @@ private slots:
     void reloadQmlWindow();
 };
 
-void tst_QQmlInspector::startQmlsceneProcess(const char *qmlFile)
+void tst_QQmlInspector::startQmlsceneProcess(const char * /* qmlFile */)
 {
     const QString argument = "-qmljsdebugger=port:" STR_PORT ",block";
 
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
index fa0aad7a51..ab9a5ed771 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h
@@ -49,7 +49,6 @@
 #include <QtTest/QtTest>
 
 Q_DECLARE_METATYPE(QVariant)
-Q_DECLARE_METATYPE(QJSValue)
 
 class tst_QJSValue : public QObject
 {
diff --git a/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp b/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp
index 7648836b54..987f060b20 100644
--- a/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp
+++ b/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp
@@ -46,8 +46,6 @@
 #include <QJSValue>
 #include <QJSValueIterator>
 
-Q_DECLARE_METATYPE(QJSValue);
-
 class tst_QJSValueIterator : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro
index 2ffa05a007..934bb2d591 100644
--- a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro
+++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro
@@ -3,4 +3,5 @@ CONFIG += plugin
 SOURCES += plugin.cpp
 QT = core qml
 
+DESTDIR = ./
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp
index 70cb319938..168e685699 100644
--- a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp
+++ b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp
@@ -201,7 +201,7 @@ void tst_qqmlbundle::import()
     engine.addImportPath(testFile("imports"));
 
     QQmlComponent component(&engine, testFileUrl("import.qml"));
-    QVERIFY(component.isReady());
+    QVERIFY2(component.isReady(), QQmlDataTest::msgComponentError(component, &engine));
 
     QObject *o = component.create();
     QVERIFY(o != 0);
diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index d3aba444af..748d4d71e8 100644
--- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
+++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -226,20 +226,13 @@ void tst_qqmlcomponent::qmlCreateObjectWithProperties()
     delete testBindingThisObj;
 }
 
-static QStringList warnings;
-static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &warning)
-{
-    warnings << warning;
-}
-
 void tst_qqmlcomponent::qmlCreateParentReference()
 {
     QQmlEngine engine;
 
     QCOMPARE(engine.outputWarningsToStandardError(), true);
 
-    warnings.clear();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QQmlComponent component(&engine, testFileUrl("createParentReference.qml"));
     QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8());
@@ -249,12 +242,10 @@ void tst_qqmlcomponent::qmlCreateParentReference()
     QVERIFY(QMetaObject::invokeMethod(object, "createChild"));
     delete object;
 
-    qInstallMessageHandler(old);
-
     engine.setOutputWarningsToStandardError(false);
     QCOMPARE(engine.outputWarningsToStandardError(), false);
 
-    QCOMPARE(warnings.count(), 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 void tst_qqmlcomponent::async()
@@ -398,13 +389,14 @@ void tst_qqmlcomponent::onDestructionCount()
     // Warning should not be emitted any further
     QCOMPARE(engine.outputWarningsToStandardError(), true);
 
-    warnings.clear();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
-
-    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-    QCoreApplication::processEvents();
+    QStringList warnings;
+    {
+        QQmlTestMessageHandler messageHandler;
 
-    qInstallMessageHandler(old);
+        QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+        QCoreApplication::processEvents();
+        warnings = messageHandler.messages();
+    }
 
     engine.setOutputWarningsToStandardError(false);
     QCOMPARE(engine.outputWarningsToStandardError(), false);
diff --git a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
index b9e31d2216..a7ef405aa3 100644
--- a/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
+++ b/tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
@@ -231,7 +231,7 @@ class TestObject : public QObject
     Q_PROPERTY(bool ran READ ran WRITE setRan)
 
 public:
-    TestObject(QObject *parent = 0) : m_ran(false) {}
+    TestObject(QObject *parent = 0) : QObject(parent), m_ran(false) {}
     ~TestObject() {}
 
     bool ran() const { return m_ran; }
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index aa00115f5e..e0f5317945 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -285,6 +285,7 @@ private:
     int m_intProperty;
     Qt::MouseButtons m_buttons;
 };
+Q_DECLARE_METATYPE(QQmlListProperty<MyQmlObject>)
 
 QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
 
@@ -696,7 +697,6 @@ public:
     }
 };
 
-Q_DECLARE_METATYPE(QJSValue);
 class MyInvokableBaseObject : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 370db68024..fb6efcaf5d 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -290,6 +290,7 @@ private slots:
 
 private:
     static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
+    static void verifyContextLifetime(QQmlContextData *ctxt);
     QQmlEngine engine;
 };
 
@@ -1924,27 +1925,18 @@ void tst_qqmlecmascript::compileInvalidBinding()
     delete object;
 }
 
-static int transientErrorsMsgCount = 0;
-static void transientErrorsMsgHandler(QtMsgType, const QMessageLogContext &, const QString &)
-{
-    ++transientErrorsMsgCount;
-}
-
 // Check that transient binding errors are not displayed
 void tst_qqmlecmascript::transientErrors()
 {
     {
     QQmlComponent component(&engine, testFileUrl("transientErrors.qml"));
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 
     delete object;
     }
@@ -1953,15 +1945,12 @@ void tst_qqmlecmascript::transientErrors()
     {
     QQmlComponent component(&engine, testFileUrl("transientErrors.2.qml"));
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 
     delete object;
     }
@@ -1974,13 +1963,11 @@ void tst_qqmlecmascript::shutdownErrors()
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     delete object;
 
-    qInstallMessageHandler(old);
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 void tst_qqmlecmascript::compositePropertyType()
@@ -2855,7 +2842,6 @@ void tst_qqmlecmascript::listToVariant()
 }
 
 // QTBUG-16316
-Q_DECLARE_METATYPE(QQmlListProperty<MyQmlObject>)
 void tst_qqmlecmascript::listAssignment()
 {
     QQmlComponent component(&engine, testFileUrl("listAssignment.qml"));
@@ -3785,6 +3771,42 @@ void tst_qqmlecmascript::singletonTypeResolution()
     delete object;
 }
 
+void tst_qqmlecmascript::verifyContextLifetime(QQmlContextData *ctxt) {
+    QQmlContextData *childCtxt = ctxt->childContexts;
+
+    if (!ctxt->importedScripts.isEmpty()) {
+        QV8Engine *engine = QV8Engine::get(ctxt->engine);
+        foreach (v8::Persistent<v8::Object> qmlglobal, ctxt->importedScripts) {
+            QQmlContextData *scriptContext, *newContext;
+
+            if (qmlglobal.IsEmpty())
+                continue;
+
+            scriptContext = engine->contextWrapper()->context(qmlglobal);
+
+            {
+                v8::HandleScope handle_scope;
+                v8::Persistent<v8::Context> context = v8::Context::New();
+                v8::Context::Scope context_scope(context);
+                v8::Local<v8::Object> temporaryScope = engine->qmlScope(scriptContext, NULL);
+                Q_UNUSED(temporaryScope)
+
+                context.Dispose();
+            }
+
+            QV8Engine::gc();
+            newContext = engine->contextWrapper()->context(qmlglobal);
+            QVERIFY(scriptContext == newContext);
+        }
+    }
+
+    while (childCtxt) {
+        verifyContextLifetime(childCtxt);
+
+        childCtxt = childCtxt->nextChild;
+    }
+}
+
 void tst_qqmlecmascript::importScripts_data()
 {
     QTest::addColumn<QUrl>("testfile");
@@ -4016,6 +4038,10 @@ void tst_qqmlecmascript::importScripts()
         QVERIFY(object == 0);
     } else {
         QVERIFY(object != 0);
+
+        QQmlContextData *ctxt = QQmlContextData::get(engine.rootContext());
+        tst_qqmlecmascript::verifyContextLifetime(ctxt);
+
         for (int i = 0; i < propertyNames.size(); ++i)
             QCOMPARE(object->property(propertyNames.at(i).toLatin1().constData()), propertyValues.at(i));
         delete object;
@@ -5756,14 +5782,11 @@ void tst_qqmlecmascript::qtbug_9792()
 
     delete context;
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     object->basicSignal();
-    
-    qInstallMessageHandler(old);
 
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 
     delete object;
 }
@@ -5797,14 +5820,11 @@ void tst_qqmlecmascript::noSpuriousWarningsAtShutdown()
 
     QObject *o = component.create();
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     delete o;
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     }
 
 
@@ -5813,14 +5833,11 @@ void tst_qqmlecmascript::noSpuriousWarningsAtShutdown()
 
     QObject *o = component.create();
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     delete o;
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     }
 }
 
@@ -6634,22 +6651,15 @@ void tst_qqmlecmascript::doubleEvaluate()
     delete object;
 }
 
-static QStringList messages;
-static void captureMsgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
-{
-    messages.append(msg);
-}
-
 void tst_qqmlecmascript::nonNotifyable()
 {
     QV4Compiler::enableV4(false);
     QQmlComponent component(&engine, testFileUrl("nonNotifyable.qml"));
     QV4Compiler::enableV4(true);
 
-    QtMessageHandler old = qInstallMessageHandler(captureMsgHandler);
-    messages.clear();
+    QQmlTestMessageHandler messageHandler;
+
     QObject *object = component.create();
-    qInstallMessageHandler(old);
 
     QVERIFY(object != 0);
 
@@ -6660,9 +6670,9 @@ void tst_qqmlecmascript::nonNotifyable()
                         QLatin1String(object->metaObject()->className()) +
                         QLatin1String("::value");
 
-    QCOMPARE(messages.length(), 2);
-    QCOMPARE(messages.at(0), expected1);
-    QCOMPARE(messages.at(1), expected2);
+    QCOMPARE(messageHandler.messages().length(), 2);
+    QCOMPARE(messageHandler.messages().at(0), expected1);
+    QCOMPARE(messageHandler.messages().at(1), expected2);
 
     delete object;
 }
@@ -7087,16 +7097,14 @@ void tst_qqmlecmascript::bindingSuppression()
     EventProcessor processor;
     engine.rootContext()->setContextProperty("pendingEvents", &processor);
 
-    transientErrorsMsgCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(transientErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QQmlComponent c(&engine, testFileUrl("bindingSuppression.qml"));
     QObject *obj = c.create();
     QVERIFY(obj != 0);
     delete obj;
 
-    qInstallMessageHandler(old);
-    QCOMPARE(transientErrorsMsgCount, 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 void tst_qqmlecmascript::signalEmitted()
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 128294bbcb..2a78831ba1 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -417,12 +417,6 @@ void tst_qqmlengine::failedCompilation_data()
     QTest::newRow("Invalid content") << "failedCompilation.1.qml";
 }
 
-static QStringList warnings;
-static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &warning)
-{
-    warnings << warning;
-}
-
 void tst_qqmlengine::outputWarningsToStandardError()
 {
     QQmlEngine engine;
@@ -434,35 +428,26 @@ void tst_qqmlengine::outputWarningsToStandardError()
 
     QVERIFY(c.isReady() == true);
 
-    warnings.clear();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QObject *o = c.create();
 
-    qInstallMessageHandler(old);
-
     QVERIFY(o != 0);
     delete o;
 
-    QCOMPARE(warnings.count(), 1);
-    QCOMPARE(warnings.at(0), QLatin1String("<Unknown File>: Unable to assign [undefined] to int"));
-    warnings.clear();
-
+    QCOMPARE(messageHandler.messages().count(), 1);
+    QCOMPARE(messageHandler.messages().at(0), QLatin1String("<Unknown File>: Unable to assign [undefined] to int"));
+    messageHandler.clear();
 
     engine.setOutputWarningsToStandardError(false);
     QCOMPARE(engine.outputWarningsToStandardError(), false);
 
-
-    old = qInstallMessageHandler(msgHandler);
-
     o = c.create();
 
-    qInstallMessageHandler(old);
-
     QVERIFY(o != 0);
     delete o;
 
-    QCOMPARE(warnings.count(), 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 void tst_qqmlengine::objectOwnership()
diff --git a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
index 1eb4a203a3..73f29ab973 100644
--- a/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
+++ b/tests/auto/qml/qqmlinstruction/qqmlinstruction.pro
@@ -5,5 +5,7 @@ macx:CONFIG -= app_bundle
 
 CONFIG += parallel_test
 
+include (../../shared/util.pri)
+
 QT += core-private gui-private v8-private qml-private testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
index 7d27751e77..e25c38d9cc 100644
--- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
+++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
+#include "../../shared/util.h"
 #include <private/qqmlcompiler_p.h>
 
 #include <QVector3D>
@@ -65,12 +66,6 @@ private slots:
     void time();
 };
 
-static QStringList messages;
-static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
-{
-    messages << msg;
-}
-
 void tst_qqmlinstruction::dump()
 {
     QQmlEngine engine;
@@ -128,14 +123,14 @@ void tst_qqmlinstruction::dump()
     {
         QQmlCompiledData::Instruction::StoreFloat i;
         i.propertyIndex = 3;
-        i.value = 11.3;
+        i.value = 11.3f;
         data->addInstruction(i);
     }
 
     {
         QQmlCompiledData::Instruction::StoreDouble i;
         i.propertyIndex = 4;
-        i.value = 14.8;
+        i.value = 14.8f;
         data->addInstruction(i);
     }
 
@@ -564,15 +559,14 @@ void tst_qqmlinstruction::dump()
         << "57\t\tSTORE_VAR_BOOL\t\t83\ttrue"
         << "-------------------------------------------------------------------------------";
 
-    messages = QStringList();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     data->dumpInstructions();
-    qInstallMessageHandler(old);
 
-    QCOMPARE(messages.count(), expect.count());
-    for (int ii = 0; ii < messages.count(); ++ii) {
-        QCOMPARE(messages.at(ii), expect.at(ii));
+    const int messageCount = messageHandler.messages().count();
+    QCOMPARE(messageCount, expect.count());
+    for (int ii = 0; ii < messageCount; ++ii) {
+        QCOMPARE(messageHandler.messages().at(ii), expect.at(ii));
     }
 
     data->release();
@@ -676,8 +670,8 @@ void tst_qqmlinstruction::vector3d()
     QCOMPARE(Q_ALIGNOF(QQmlInstruction::instr_storeVector3D::QVector3D), Q_ALIGNOF(QVector3D));
 
     QQmlInstruction i;
-    i.storeVector3D.vector.xp = 8.2;
-    i.storeVector3D.vector.yp = 99.3;
+    i.storeVector3D.vector.xp = 8.2f;
+    i.storeVector3D.vector.yp = 99.3f;
     i.storeVector3D.vector.zp = 12.0;
 
     const QVector3D &vector = (const QVector3D &)(i.storeVector3D.vector);
@@ -692,10 +686,10 @@ void tst_qqmlinstruction::vector4d()
     QCOMPARE(Q_ALIGNOF(QQmlInstruction::instr_storeVector4D::QVector4D), Q_ALIGNOF(QVector4D));
 
     QQmlInstruction i;
-    i.storeVector4D.vector.xp = 8.2;
-    i.storeVector4D.vector.yp = 99.3;
+    i.storeVector4D.vector.xp = 8.2f;
+    i.storeVector4D.vector.yp = 99.3f;
     i.storeVector4D.vector.zp = 12.0;
-    i.storeVector4D.vector.wp = 121.1;
+    i.storeVector4D.vector.wp = 121.1f;
 
     const QVector4D &vector = (const QVector4D &)(i.storeVector4D.vector);
     QCOMPARE(vector.x(), (qreal)(float)8.2);
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.1.qml b/tests/auto/qml/qqmllanguage/data/importJs.1.qml
index eaba98ecd2..89344c02cc 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.1.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.1.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.0
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.10.qml b/tests/auto/qml/qqmllanguage/data/importJs.10.qml
index 578ca47ea5..c0bb730ac7 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.10.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.10.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.0 as PJM
-import com.nokia.PureJsModule 1.0 as AnotherName
+import org.qtproject.PureJsModule 1.0 as PJM
+import org.qtproject.PureJsModule 1.0 as AnotherName
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.2.qml b/tests/auto/qml/qqmllanguage/data/importJs.2.qml
index dd3d65c5dd..5a0659fb26 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.2.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.2.qml
@@ -1,4 +1,4 @@
-import com.nokia.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.3.qml b/tests/auto/qml/qqmllanguage/data/importJs.3.qml
index f59d445a56..e241d610ae 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.3.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.3.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.0
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.4.qml b/tests/auto/qml/qqmllanguage/data/importJs.4.qml
index e7b74bac0a..d323cfab3b 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.4.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.4.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.6
+import org.qtproject.PureJsModule 1.6
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
index 10dbc80297..7f8648bace 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
@@ -1 +1 @@
-1:1:module "com.nokia.VersionedOnlyJsModule" is not installed
+1:1:module "org.qtproject.VersionedOnlyJsModule" is not installed
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.5.qml b/tests/auto/qml/qqmllanguage/data/importJs.5.qml
index a9ec20c72b..c0a77dada2 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.5.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.5.qml
@@ -1,4 +1,4 @@
-import com.nokia.VersionedOnlyJsModule 1.0
+import org.qtproject.VersionedOnlyJsModule 1.0
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
index 41c99702a2..53b7ade8bf 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
@@ -1 +1 @@
-2:1:"com.nokia.VersionedOnlyJsModule" is ambiguous.
+2:1:"org.qtproject.VersionedOnlyJsModule" is ambiguous.
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.6.qml b/tests/auto/qml/qqmllanguage/data/importJs.6.qml
index 6c4eb89551..e5f2e13f10 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.6.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.6.qml
@@ -1,5 +1,5 @@
-import com.nokia.VersionedOnlyJsModule 9.0
-import com.nokia.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
index 56bc4c548f..8a5f3c6721 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
@@ -1 +1 @@
-2:1:"com.nokia.PureJsModule" is ambiguous.
+2:1:"org.qtproject.PureJsModule" is ambiguous.
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.7.qml b/tests/auto/qml/qqmllanguage/data/importJs.7.qml
index 5523a158bd..7b3501ad8f 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.7.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.7.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.0
-import com.nokia.PureJsModule 1.6
+import org.qtproject.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.6
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.8.qml b/tests/auto/qml/qqmllanguage/data/importJs.8.qml
index 4ddedc31a8..0d5ad052e7 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.8.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.8.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.5 as PJM
+import org.qtproject.PureJsModule 1.5 as PJM
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importJs.9.qml b/tests/auto/qml/qqmllanguage/data/importJs.9.qml
index 351164ba41..9b6dc1e073 100644
--- a/tests/auto/qml/qqmllanguage/data/importJs.9.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.9.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.5 as PJM_1_5
-import com.nokia.PureJsModule 1.6 as PJM_1_6
+import org.qtproject.PureJsModule 1.5 as PJM_1_5
+import org.qtproject.PureJsModule 1.6 as PJM_1_6
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt
index 89e58ee764..59b0b87477 100644
--- a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt
@@ -1 +1 @@
-1:35:Library import requires a version
+1:39:Library import requires a version
diff --git a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml
index 97ec22280f..6ad2a812e9 100644
--- a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml
+++ b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml
@@ -1,3 +1,3 @@
-import com.nokia.installedtest as T
+import org.qtproject.installedtest as T
 
 T.InstalledTest {}
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js
index c7b3c8b6ca..c7b3c8b6ca 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js
index b90033eeb4..b90033eeb4 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js
index b802477cb6..b802477cb6 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir
index 083afb051c..083afb051c 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js
index b90033eeb4..b90033eeb4 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js
index b802477cb6..b802477cb6 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir
index 5c3acebd39..5c3acebd39 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js
index efac613fc2..efac613fc2 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir
index 5c1b182028..5c1b182028 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml
index 56daa9c09a..56daa9c09a 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml
index 59df88216e..59df88216e 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml
index 26a5d6bba9..26a5d6bba9 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml
index ed1b09e419..ed1b09e419 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir
index d15720a154..d15720a154 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml
index 56daa9c09a..56daa9c09a 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml
index 59df88216e..59df88216e 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir
index b301226099..b301226099 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml
index 617bdaaf67..617bdaaf67 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml
index 617bdaaf67..617bdaaf67 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir
index 90ad9fdb19..90ad9fdb19 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir
index c492dec4d7..c492dec4d7 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js
index 6a53b53b02..6a53b53b02 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js
index 34d5cdda65..34d5cdda65 100644
--- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js
+++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js
diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 1f9a8492d9..e83e9e11ac 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -66,8 +66,6 @@ public:
     int id;
 };
 
-Q_DECLARE_METATYPE(QJSValue)
-
 QT_BEGIN_NAMESPACE
 #define MyInterface_iid "org.qt-project.Qt.Test.MyInterface"
 Q_DECLARE_INTERFACE(MyInterface, MyInterface_iid);
@@ -941,7 +939,7 @@ class MyUncreateableBaseClass : public QObject
     Q_PROPERTY(bool prop2 READ prop2 WRITE setprop2 REVISION 1)
     Q_PROPERTY(bool prop3 READ prop3 WRITE setprop3 REVISION 1)
 public:
-    explicit MyUncreateableBaseClass(bool arg, QObject *parent = 0)
+    explicit MyUncreateableBaseClass(bool /* arg */, QObject *parent = 0)
         : QObject(parent), _prop1(false), _prop2(false), _prop3(false)
     {
     }
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 70f8f484e0..1c7a0876f6 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -596,8 +596,8 @@ void tst_qqmllanguage::assignBasicTypes()
     QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
     QCOMPARE(object->boolProperty(), true);
     QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
-    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
-    QCOMPARE(object->vector4Property(), QVector4D(10, 1, 2.2, 2.3));
+    QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f));
+    QCOMPARE(object->vector4Property(), QVector4D(10, 1, 2.2f, 2.3f));
     QUrl encoded;
     encoded.setEncodedUrl("main.qml?with%3cencoded%3edata", QUrl::TolerantMode);
     QCOMPARE(object->urlProperty(), component.url().resolved(encoded));
@@ -1977,101 +1977,101 @@ void tst_qqmllanguage::importsBuiltin_data()
         << ""
         << "Test is not a type";
     QTest::newRow("not in version 0.0")
-        << "import com.nokia.Test 0.0\n"
+        << "import org.qtproject.Test 0.0\n"
            "Test {}"
         << ""
         << "Test is not a type";
     QTest::newRow("version not installed")
-        << "import com.nokia.Test 99.0\n"
+        << "import org.qtproject.Test 99.0\n"
            "Test {}"
         << ""
-        << "module \"com.nokia.Test\" version 99.0 is not installed";
+        << "module \"org.qtproject.Test\" version 99.0 is not installed";
     QTest::newRow("in version 0.0")
-        << "import com.nokia.Test 0.0\n"
+        << "import org.qtproject.Test 0.0\n"
            "TestTP {}"
         << "TestType"
         << "";
     QTest::newRow("qualified in version 0.0")
-        << "import com.nokia.Test 0.0 as T\n"
+        << "import org.qtproject.Test 0.0 as T\n"
            "T.TestTP {}"
         << "TestType"
         << "";
     QTest::newRow("in version 1.0")
-        << "import com.nokia.Test 1.0\n"
+        << "import org.qtproject.Test 1.0\n"
            "Test {}"
         << "TestType"
         << "";
     QTest::newRow("qualified wrong")
-        << "import com.nokia.Test 1.0 as T\n" // QT-610
+        << "import org.qtproject.Test 1.0 as T\n" // QT-610
            "Test {}"
         << ""
         << "Test is not a type";
     QTest::newRow("qualified right")
-        << "import com.nokia.Test 1.0 as T\n"
+        << "import org.qtproject.Test 1.0 as T\n"
            "T.Test {}"
         << "TestType"
         << "";
     QTest::newRow("qualified right but not in version 0.0")
-        << "import com.nokia.Test 0.0 as T\n"
+        << "import org.qtproject.Test 0.0 as T\n"
            "T.Test {}"
         << ""
         << "T.Test is not a type";
     QTest::newRow("in version 1.1")
-        << "import com.nokia.Test 1.1\n"
+        << "import org.qtproject.Test 1.1\n"
            "Test {}"
         << "TestType"
         << "";
     QTest::newRow("in version 1.3")
-        << "import com.nokia.Test 1.3\n"
+        << "import org.qtproject.Test 1.3\n"
            "Test {}"
         << "TestType"
         << "";
     QTest::newRow("in version 1.5")
-        << "import com.nokia.Test 1.5\n"
+        << "import org.qtproject.Test 1.5\n"
            "Test {}"
         << "TestType"
         << "";
     QTest::newRow("changed in version 1.8")
-        << "import com.nokia.Test 1.8\n"
+        << "import org.qtproject.Test 1.8\n"
            "Test {}"
         << "TestType2"
         << "";
     QTest::newRow("in version 1.12")
-        << "import com.nokia.Test 1.12\n"
+        << "import org.qtproject.Test 1.12\n"
            "Test {}"
         << "TestType2"
         << "";
     QTest::newRow("old in version 1.9")
-        << "import com.nokia.Test 1.9\n"
+        << "import org.qtproject.Test 1.9\n"
            "OldTest {}"
         << "TestType"
         << "";
     QTest::newRow("old in version 1.11")
-        << "import com.nokia.Test 1.11\n"
+        << "import org.qtproject.Test 1.11\n"
            "OldTest {}"
         << "TestType"
         << "";
     QTest::newRow("multiversion 1")
-        << "import com.nokia.Test 1.11\n"
-           "import com.nokia.Test 1.12\n"
+        << "import org.qtproject.Test 1.11\n"
+           "import org.qtproject.Test 1.12\n"
            "Test {}"
         << (!qmlCheckTypes()?"TestType2":"")
-        << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test/ in version 1.12 and 1.11");
+        << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test/ in version 1.12 and 1.11");
     QTest::newRow("multiversion 2")
-        << "import com.nokia.Test 1.11\n"
-           "import com.nokia.Test 1.12\n"
+        << "import org.qtproject.Test 1.11\n"
+           "import org.qtproject.Test 1.12\n"
            "OldTest {}"
         << (!qmlCheckTypes()?"TestType":"")
-        << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in com/nokia/Test/ in version 1.12 and 1.11");
+        << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in org/qtproject/Test/ in version 1.12 and 1.11");
     QTest::newRow("qualified multiversion 3")
-        << "import com.nokia.Test 1.0 as T0\n"
-           "import com.nokia.Test 1.8 as T8\n"
+        << "import org.qtproject.Test 1.0 as T0\n"
+           "import org.qtproject.Test 1.8 as T8\n"
            "T0.Test {}"
         << "TestType"
         << "";
     QTest::newRow("qualified multiversion 4")
-        << "import com.nokia.Test 1.0 as T0\n"
-           "import com.nokia.Test 1.8 as T8\n"
+        << "import org.qtproject.Test 1.0 as T0\n"
+           "import org.qtproject.Test 1.8 as T8\n"
            "T8.Test {}"
         << "TestType2"
         << "";
@@ -2128,10 +2128,10 @@ void tst_qqmllanguage::importsLocal_data()
         << "Test is not a type";
     QTest::newRow("library precedence over local import")
         << "import \"subdir\"\n"
-           "import com.nokia.Test 1.0\n"
+           "import org.qtproject.Test 1.0\n"
            "Test {}"
         << (!qmlCheckTypes()?"TestType":"")
-        << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test/ and in subdir/");
+        << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test/ and in subdir/");
 }
 
 void tst_qqmllanguage::importsLocal()
@@ -2221,60 +2221,60 @@ void tst_qqmllanguage::importsInstalled_data()
 
     // import installed
     QTest::newRow("installed import 0")
-        << "import com.nokia.installedtest0 0.0\n"
+        << "import org.qtproject.installedtest0 0.0\n"
            "InstalledTestTP {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 0 as TP")
-        << "import com.nokia.installedtest0 0.0 as TP\n"
+        << "import org.qtproject.installedtest0 0.0 as TP\n"
            "TP.InstalledTestTP {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 1")
-        << "import com.nokia.installedtest 1.0\n"
+        << "import org.qtproject.installedtest 1.0\n"
            "InstalledTest {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 2")
-        << "import com.nokia.installedtest 1.3\n"
+        << "import org.qtproject.installedtest 1.3\n"
            "InstalledTest {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 3")
-        << "import com.nokia.installedtest 1.4\n"
+        << "import org.qtproject.installedtest 1.4\n"
            "InstalledTest {}"
         << "QQuickText"
         << "";
     QTest::newRow("installed import minor version not available") // QTBUG-11936
-        << "import com.nokia.installedtest 0.1\n"
+        << "import org.qtproject.installedtest 0.1\n"
            "InstalledTest {}"
         << ""
-        << "module \"com.nokia.installedtest\" version 0.1 is not installed";
+        << "module \"org.qtproject.installedtest\" version 0.1 is not installed";
     QTest::newRow("installed import minor version not available") // QTBUG-9627
-        << "import com.nokia.installedtest 1.10\n"
+        << "import org.qtproject.installedtest 1.10\n"
            "InstalledTest {}"
         << ""
-        << "module \"com.nokia.installedtest\" version 1.10 is not installed";
+        << "module \"org.qtproject.installedtest\" version 1.10 is not installed";
     QTest::newRow("installed import major version not available") // QTBUG-9627
-        << "import com.nokia.installedtest 9.0\n"
+        << "import org.qtproject.installedtest 9.0\n"
            "InstalledTest {}"
         << ""
-        << "module \"com.nokia.installedtest\" version 9.0 is not installed";
+        << "module \"org.qtproject.installedtest\" version 9.0 is not installed";
     QTest::newRow("installed import visibility") // QT-614
-        << "import com.nokia.installedtest 1.4\n"
+        << "import org.qtproject.installedtest 1.4\n"
            "PrivateType {}"
         << ""
         << "PrivateType is not a type";
     QTest::newRow("installed import version QML clash")
-        << "import com.nokia.installedtest1 1.0\n"
+        << "import org.qtproject.installedtest1 1.0\n"
            "Test {}"
         << ""
-        << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest1\"";
+        << "\"Test\" version 1.0 is defined more than once in module \"org.qtproject.installedtest1\"";
     QTest::newRow("installed import version JS clash")
-        << "import com.nokia.installedtest2 1.0\n"
+        << "import org.qtproject.installedtest2 1.0\n"
            "Test {}"
         << ""
-        << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest2\"";
+        << "\"Test\" version 1.0 is defined more than once in module \"org.qtproject.installedtest2\"";
 }
 
 void tst_qqmllanguage::importsInstalled()
@@ -2390,45 +2390,45 @@ void tst_qqmllanguage::importsOrder_data()
     QTest::addColumn<bool>("partialMatch");
 
     QTest::newRow("double import") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.4\n"
            "InstalledTest {}"
            << (!qmlCheckTypes()?"QQuickText":"")
-           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.4 and 1.4")
+           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest/ in version 1.4 and 1.4")
            << false;
     QTest::newRow("installed import overrides 1") <<
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.4\n"
            "InstalledTest {}"
            << (!qmlCheckTypes()?"QQuickText":"")
-           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.4 and 1.0")
+           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest/ in version 1.4 and 1.0")
            << false;
     QTest::newRow("installed import overrides 2") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.0\n"
            "InstalledTest {}"
            << (!qmlCheckTypes()?"QQuickRectangle":"")
-           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.0 and 1.4")
+           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest/ in version 1.0 and 1.4")
            << false;
     QTest::newRow("installed import re-overrides 1") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.4\n"
            "InstalledTest {}"
            << (!qmlCheckTypes()?"QQuickText":"")
-           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.4 and 1.0")
+           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest/ in version 1.4 and 1.0")
            << false;
     QTest::newRow("installed import re-overrides 2") <<
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
-           "import com.nokia.installedtest 1.4\n"
-           "import com.nokia.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.4\n"
+           "import org.qtproject.installedtest 1.0\n"
            "InstalledTest {}"
            << (!qmlCheckTypes()?"QQuickRectangle":"")
-           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.0 and 1.4")
+           << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest/ in version 1.0 and 1.4")
            << false;
     QTest::newRow("installed import versus builtin 1") <<
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "import QtQuick 2.0\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QQuickRectangle":"")
@@ -2436,21 +2436,21 @@ void tst_qqmllanguage::importsOrder_data()
            << true;
     QTest::newRow("installed import versus builtin 2") <<
            "import QtQuick 2.0\n"
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QQuickText":"")
-           << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest/ and in file://")
+           << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/org/qtproject/installedtest/ and in file://")
            << true;
     QTest::newRow("namespaces cannot be overridden by types 1") <<
            "import QtQuick 2.0 as Rectangle\n"
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "Rectangle {}"
            << ""
            << "Namespace Rectangle cannot be used as a type"
            << false;
     QTest::newRow("namespaces cannot be overridden by types 2") <<
            "import QtQuick 2.0 as Rectangle\n"
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "Rectangle.Image {}"
            << "QQuickImage"
            << ""
@@ -2461,10 +2461,10 @@ void tst_qqmllanguage::importsOrder_data()
            << ""
            << false;
     QTest::newRow("local last 2") <<
-           "import com.nokia.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.0\n"
            "LocalLast {}"
-           << (!qmlCheckTypes()?"QQuickRectangle":"")// i.e. from com.nokia.installedtest, not data/LocalLast.qml
-           << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/com/nokia/installedtest/ and in ")
+           << (!qmlCheckTypes()?"QQuickRectangle":"")// i.e. from org.qtproject.installedtest, not data/LocalLast.qml
+           << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/org/qtproject/installedtest/ and in ")
            << false;
 }
 
@@ -2571,7 +2571,7 @@ void tst_qqmllanguage::importJs()
         QCOMPARE(expected.size(), actual.size());
         for (int i = 0; i < expected.size(); ++i)
         {
-            size_t compareLen = std::min(expected.at(i).length(), actual.at(i).length());
+            const int compareLen = qMin(expected.at(i).length(), actual.at(i).length());
             QCOMPARE(expected.at(i).left(compareLen), actual.at(i).left(compareLen));
         }
     }
@@ -2773,17 +2773,17 @@ void tst_qqmllanguage::initTestCase()
     registerTypes();
 
     // Registering the TestType class in other modules should have no adverse effects
-    qmlRegisterType<TestType>("com.nokia.TestPre", 1, 0, "Test");
+    qmlRegisterType<TestType>("org.qtproject.TestPre", 1, 0, "Test");
 
-    qmlRegisterType<TestType>("com.nokia.Test", 0, 0, "TestTP");
-    qmlRegisterType<TestType>("com.nokia.Test", 1, 0, "Test");
-    qmlRegisterType<TestType>("com.nokia.Test", 1, 5, "Test");
-    qmlRegisterType<TestType2>("com.nokia.Test", 1, 8, "Test");
-    qmlRegisterType<TestType>("com.nokia.Test", 1, 9, "OldTest");
-    qmlRegisterType<TestType2>("com.nokia.Test", 1, 12, "Test");
+    qmlRegisterType<TestType>("org.qtproject.Test", 0, 0, "TestTP");
+    qmlRegisterType<TestType>("org.qtproject.Test", 1, 0, "Test");
+    qmlRegisterType<TestType>("org.qtproject.Test", 1, 5, "Test");
+    qmlRegisterType<TestType2>("org.qtproject.Test", 1, 8, "Test");
+    qmlRegisterType<TestType>("org.qtproject.Test", 1, 9, "OldTest");
+    qmlRegisterType<TestType2>("org.qtproject.Test", 1, 12, "Test");
 
     // Registering the TestType class in other modules should have no adverse effects
-    qmlRegisterType<TestType>("com.nokia.TestPost", 1, 0, "Test");
+    qmlRegisterType<TestType>("org.qtproject.TestPost", 1, 0, "Test");
 
     // Create locale-specific file
     // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
@@ -2948,13 +2948,12 @@ void tst_qqmllanguage::signalWithDefaultArg()
     QCOMPARE(object->property("signalCount").toInt(), 2);
     QCOMPARE(object->property("signalArg").toInt(), 15);
 
-    const QMetaObject *metaObject = object->metaObject();
 
-    metaObject->invokeMethod(object, "emitNoArgSignal");
+    QMetaObject::invokeMethod(object, "emitNoArgSignal");
     QCOMPARE(object->property("signalCount").toInt(), 3);
     QCOMPARE(object->property("signalArg").toInt(), 5);
 
-    metaObject->invokeMethod(object, "emitArgSignal");
+    QMetaObject::invokeMethod(object, "emitArgSignal");
     QCOMPARE(object->property("signalCount").toInt(), 4);
     QCOMPARE(object->property("signalArg").toInt(), 22);
 
@@ -3065,9 +3064,8 @@ void tst_qqmllanguage::literals_data()
     QTest::newRow("special8") << "c8" << QVariant(QString("\""));
     QTest::newRow("special9") << "c9" << QVariant(QString("\\"));
     // We don't handle octal escape sequences
-//    QTest::newRow("special10") << "c10" << QVariant(QString("\251"));
-    QTest::newRow("special11") << "c10" << QVariant(QString::fromLatin1("\xa9"));
-    QTest::newRow("special12") << "c11" << QVariant(QString::fromUtf8("\u00A9"));
+    QTest::newRow("special10") << "c10" << QVariant(QString(1, QChar(0xa9)));
+    QTest::newRow("special11") << "c11" << QVariant(QString(1, QChar(0x00A9)));
 }
 
 void tst_qqmllanguage::literals()
diff --git a/tests/auto/qml/qqmlpropertymap/qqmlpropertymap.pro b/tests/auto/qml/qqmlpropertymap/qqmlpropertymap.pro
index bf22afa20c..81212bb064 100644
--- a/tests/auto/qml/qqmlpropertymap/qqmlpropertymap.pro
+++ b/tests/auto/qml/qqmlpropertymap/qqmlpropertymap.pro
@@ -4,6 +4,8 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qqmlpropertymap.cpp
 
+include (../../shared/util.pri)
+
 CONFIG += parallel_test
 
 QT += core-private gui-private qml-private quick-private testlib
diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
index 99179f533b..af2a032a30 100644
--- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
+++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
+#include "../../shared/util.h"
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlpropertymap.h>
@@ -294,19 +295,9 @@ public slots:
     void testSlot() {}
 };
 
-namespace
-{
-    QStringList messages;
-    void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
-    {
-        messages << msg;
-    }
-}
-
 void tst_QQmlPropertyMap::metaObjectAccessibility()
 {
-    messages.clear();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QQmlEngine engine;
 
@@ -318,9 +309,7 @@ void tst_QQmlPropertyMap::metaObjectAccessibility()
 
     QCOMPARE(map.metaObject()->className(), "MyEnhancedPropertyMap");
 
-    qInstallMessageHandler(old);
-
-    QCOMPARE(messages.count(), 0);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 }
 
 QTEST_MAIN(tst_QQmlPropertyMap)
diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
index 22be661755..9a525df973 100644
--- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
+++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
@@ -320,8 +320,8 @@ void tst_qqmlqt::vector2d()
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    QCOMPARE(qvariant_cast<QVector2D>(object->property("test1")), QVector2D(1, 0.9));
-    QCOMPARE(qvariant_cast<QVector2D>(object->property("test2")), QVector2D(102, -982.1));
+    QCOMPARE(qvariant_cast<QVector2D>(object->property("test1")), QVector2D(1, 0.9f));
+    QCOMPARE(qvariant_cast<QVector2D>(object->property("test2")), QVector2D(102, -982.1f));
     QCOMPARE(qvariant_cast<QVector2D>(object->property("test3")), QVector2D());
     QCOMPARE(qvariant_cast<QVector2D>(object->property("test4")), QVector2D());
 
@@ -340,8 +340,8 @@ void tst_qqmlqt::vector3d()
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test1")), QVector3D(1, 0, 0.9));
-    QCOMPARE(qvariant_cast<QVector3D>(object->property("test2")), QVector3D(102, -10, -982.1));
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test1")), QVector3D(1, 0, 0.9f));
+    QCOMPARE(qvariant_cast<QVector3D>(object->property("test2")), QVector3D(102, -10, -982.1f));
     QCOMPARE(qvariant_cast<QVector3D>(object->property("test3")), QVector3D());
     QCOMPARE(qvariant_cast<QVector3D>(object->property("test4")), QVector3D());
 
@@ -360,8 +360,8 @@ void tst_qqmlqt::vector4d()
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    QCOMPARE(qvariant_cast<QVector4D>(object->property("test1")), QVector4D(1, 0, 0.9, 0.6));
-    QCOMPARE(qvariant_cast<QVector4D>(object->property("test2")), QVector4D(102, -10, -982.1, 10));
+    QCOMPARE(qvariant_cast<QVector4D>(object->property("test1")), QVector4D(1, 0, 0.9f, 0.6f));
+    QCOMPARE(qvariant_cast<QVector4D>(object->property("test2")), QVector4D(102, -10, -982.1f, 10));
     QCOMPARE(qvariant_cast<QVector4D>(object->property("test3")), QVector4D());
     QCOMPARE(qvariant_cast<QVector4D>(object->property("test4")), QVector4D());
 
@@ -380,8 +380,8 @@ void tst_qqmlqt::quaternion()
     QObject *object = component.create();
     QVERIFY(object != 0);
 
-    QCOMPARE(qvariant_cast<QQuaternion>(object->property("test1")), QQuaternion(2, 17, 0.9, 0.6));
-    QCOMPARE(qvariant_cast<QQuaternion>(object->property("test2")), QQuaternion(102, -10, -982.1, 10));
+    QCOMPARE(qvariant_cast<QQuaternion>(object->property("test1")), QQuaternion(2, 17, 0.9f, 0.6f));
+    QCOMPARE(qvariant_cast<QQuaternion>(object->property("test2")), QQuaternion(102, -10, -982.1f, 10));
     QCOMPARE(qvariant_cast<QQuaternion>(object->property("test3")), QQuaternion());
     QCOMPARE(qvariant_cast<QQuaternion>(object->property("test4")), QQuaternion());
 
diff --git a/tests/auto/qml/v4/tst_v4.cpp b/tests/auto/qml/v4/tst_v4.cpp
index f5e66a1d83..0644b363dd 100644
--- a/tests/auto/qml/v4/tst_v4.cpp
+++ b/tests/auto/qml/v4/tst_v4.cpp
@@ -104,16 +104,6 @@ void tst_v4::initTestCase()
     registerTypes();
 }
 
-static int v4ErrorCount;
-static QList<QString> v4ErrorMessages;
-static void v4ErrorsMsgHandler(QtMsgType, const QMessageLogContext &, const QString &message)
-{
-    v4ErrorMessages.append(message);
-
-    if (message.contains("QV4"))
-        ++v4ErrorCount;
-}
-
 void tst_v4::qtscript()
 {
     QFETCH(QString, file);
@@ -121,21 +111,14 @@ void tst_v4::qtscript()
 
     QQmlComponent component(&engine, testFileUrl(file));
 
-    v4ErrorCount = 0;
-    v4ErrorMessages.clear();
-    QtMessageHandler old = qInstallMessageHandler(v4ErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QObject *o = component.create();
     delete o;
 
-    qInstallMessageHandler(old);
-
-    if (v4ErrorCount) {
-        foreach (const QString &msg, v4ErrorMessages)
-            qDebug() << msg;
-    }
     QEXPECT_FAIL("jsvalueHandling", "QTBUG-26951 - QJSValue has a different representation of NULL to QV8Engine", Continue);
-    QCOMPARE(v4ErrorCount, 0);
+    const int v4ErrorCount = messageHandler.messages().filter(QLatin1String("QV4")).size();
+    QVERIFY2(v4ErrorCount == 0, qPrintable(messageHandler.messageString()));
 
     QV4Compiler::enableBindingsTest(false);
 }
@@ -959,12 +942,6 @@ void tst_v4::subscriptions()
     }
 }
 
-static QStringList messages;
-static void msgHandler(QtMsgType, const QMessageLogContext &, const QString &msg)
-{
-    messages << msg;
-}
-
 static QByteArray getAddress(int address)
 {
     return QByteArray::number(address);
@@ -1108,8 +1085,7 @@ void tst_v4::debuggingDumpInstructions()
     expectedPreAddress << "\t\tInitString\t\tString_DataIndex(0) -> String_Slot(0)";
     QStringList expected;
 
-    messages = QStringList();
-    QtMessageHandler old = qInstallMessageHandler(msgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     QQmlJS::Bytecode bc;
 #define DUMP_INSTR_IN_UNIT_TEST(I, FMT) { QQmlJS::V4InstrData<QQmlJS::V4Instr::I> i; memset(&i, 0, sizeof(i)); bc.append(i); }
@@ -1130,15 +1106,15 @@ void tst_v4::debuggingDumpInstructions()
     bc.dump(start, end);
 
     // ensure that the output was expected.
-    qInstallMessageHandler(old);
-    QCOMPARE(messages.count(), expected.count());
-    for (int ii = 0; ii < messages.count(); ++ii) {
+    const int messageCount = messageHandler.messages().count();
+    QCOMPARE(messageCount, expected.count());
+    for (int ii = 0; ii < messageCount; ++ii) {
         // Calculating the destination address of a null jump/branch instruction is tricky
         // so instead we simply don't compare that part of those instructions.
         QRegExp ignoreAddress("\\bAddress\\((\\w*)\\)");
         ignoreAddress.setMinimal(true);
         QString expectOut = expected.at(ii); expectOut.replace(ignoreAddress, "");
-        QString actualOut = messages.at(ii); actualOut.replace(ignoreAddress, "");
+        QString actualOut = messageHandler.messages().at(ii); actualOut.replace(ignoreAddress, "");
         QCOMPARE(actualOut, expectOut);
     }
 }
diff --git a/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml b/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml
new file mode 100644
index 0000000000..466bb160aa
--- /dev/null
+++ b/tests/auto/qmltest/animations/tst_abstractanimationjobcrash.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtTest 1.0
+
+Item {
+    Rectangle {
+        id: rect
+
+        property bool finished: false
+
+        Behavior on opacity {
+            NumberAnimation {
+                onRunningChanged: {
+                    if (!running) {
+                        if (rect.opacity <= 0.1)
+                            rect.opacity = 1
+                        else
+                            rect.finished = true
+                    }
+                }
+            }
+        }
+    }
+
+    TestCase {
+        name: "AbstractAnitaionJobCrash"
+
+        function test_noCrash() {
+            rect.opacity = 0
+            while (!rect.finished)
+                wait(100)
+        }
+    }
+}
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index 7c95104eed..0a7967654c 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -1,6 +1,6 @@
 TEMPLATE=app
 TARGET=tst_qmltest
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qmltest.cpp
 
 
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 63f05a61d9..ed43be71d7 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -116,9 +116,6 @@ tst_examples::tst_examples() : window(0)
     excludedDirs << "snippets/qml/xmlrole.qml";
 #endif
 
-    // QTBUG-24034 - don't run customparticle examples
-    excludedDirs << "demos/flickr";
-    excludedDirs << "examples/particles/customparticle";
 }
 
 tst_examples::~tst_examples()
diff --git a/tests/auto/quick/geometry/tst_geometry.cpp b/tests/auto/quick/geometry/tst_geometry.cpp
index 8bf65d1638..fc5e921db5 100644
--- a/tests/auto/quick/geometry/tst_geometry.cpp
+++ b/tests/auto/quick/geometry/tst_geometry.cpp
@@ -139,9 +139,9 @@ void GeometryTest::testCustomGeometry()
     };
 
     static QSGGeometry::Attribute attributes[] = {
-        { 0, 2, GL_FLOAT },
-        { 1, 4, GL_UNSIGNED_BYTE },
-        { 2, 4, GL_FLOAT },
+        { 0, 2, GL_FLOAT, 0, 0},
+        { 1, 4, GL_UNSIGNED_BYTE, 0, 0},
+        { 2, 4, GL_FLOAT, 0, 0},
     };
     static QSGGeometry::AttributeSet set = { 4, 6 * sizeof(float) + 4 * sizeof(unsigned char), attributes };
 
diff --git a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
index c71903a195..b5e03ee620 100644
--- a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
+++ b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
@@ -2,7 +2,7 @@ QT += core-private gui-private qml-private
 TEMPLATE=app
 TARGET=tst_qquickanimationcontroller
 
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 CONFIG += parallel_test
 SOURCES += tst_qquickanimationcontroller.cpp
 
diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
index 01c3a5eb02..a164de735a 100644
--- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
+++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
@@ -2,7 +2,7 @@ QT += core-private gui-private qml-private
 TEMPLATE=app
 TARGET=tst_qquickcanvasitem
 
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qquickcanvasitem.cpp
 
 TESTDATA = data/*
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 37d96f4950..dc0db6d4ff 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -292,6 +292,7 @@ private:
     }
     void releaseView(QQuickView *view) {
         Q_ASSERT(view == m_view);
+        Q_UNUSED(view)
         m_view->setSource(QUrl());
     }
 #else
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 38c9bb3d8a..bce1366e52 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -661,13 +661,6 @@ void tst_qquickimage::sourceSize_QTBUG_16389()
     delete window;
 }
 
-static int numberOfWarnings = 0;
-static void checkWarnings(QtMsgType, const QMessageLogContext &, const QString &msg)
-{
-    if (!msg.contains("QGLContext::makeCurrent(): Failed."))
-        numberOfWarnings++;
-}
-
 // QTBUG-15690
 void tst_qquickimage::nullPixmapPaint()
 {
@@ -679,12 +672,11 @@ void tst_qquickimage::nullPixmapPaint()
     QTRY_VERIFY(image != 0);
     image->setSource(SERVER_ADDR + QString("/no-such-file.png"));
 
-    QtMessageHandler previousMsgHandler = qInstallMessageHandler(checkWarnings);
-
+    QQmlTestMessageHandler messageHandler;
     // used to print "QTransform::translate with NaN called"
     QPixmap pm = QPixmap::fromImage(window->grabWindow());
-    qInstallMessageHandler(previousMsgHandler);
-    QVERIFY(numberOfWarnings == 0);
+    const QStringList glErrors =  messageHandler.messages().filter(QLatin1String("QGLContext::makeCurrent(): Failed."), Qt::CaseInsensitive);
+    QVERIFY2(glErrors.size() == messageHandler.messages().size(), qPrintable(messageHandler.messageString()));
     delete image;
 
     delete window;
diff --git a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
index 64eb0a7f42..19b547944c 100644
--- a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
+++ b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
@@ -236,7 +236,7 @@ void tst_qquickimageprovider::runTest(bool async, QQuickImageProvider *provider)
 
     // From this point on, treat forced async providers as async behaviour-wise
     if (engine.imageProvider(QUrl(source).host()) == provider)
-        async |= provider->flags() & QQuickImageProvider::ForceAsynchronousImageLoading;
+        async |= (provider->flags() & QQuickImageProvider::ForceAsynchronousImageLoading) != 0;
 
     if (async)
         QTRY_VERIFY(obj->status() == QQuickImage::Loading);
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index af628dff63..51ce74ef40 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -259,18 +259,10 @@ private:
     }
 #endif
 
-    static void errorMsgHandler(QtMsgType, const QMessageLogContext &, const QString &)
-    {
-        ++m_errorCount;
-    }
-
     QQuickView *m_view;
     QString testForView;
-    static int m_errorCount;
 };
 
-int tst_QQuickListView::m_errorCount = 0;
-
 class TestObject : public QObject
 {
     Q_OBJECT
@@ -6785,8 +6777,7 @@ void tst_QQuickListView::parentBinding()
 {
     QQuickView *window = createView();
 
-    m_errorCount = 0;
-    QtMessageHandler old = qInstallMessageHandler(errorMsgHandler);
+    QQmlTestMessageHandler messageHandler;
 
     window->setSource(testFileUrl("parentBinding.qml"));
     window->show();
@@ -6805,9 +6796,7 @@ void tst_QQuickListView::parentBinding()
     QCOMPARE(item->height(), listview->height()/12);
 
     // there should be no transient binding error
-    QVERIFY(!m_errorCount);
-
-    qInstallMessageHandler(old);
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
 
     delete window;
 }
diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
index 698c016f6f..e456297a4e 100644
--- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp
+++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
@@ -462,6 +462,7 @@ void tst_QQuickLoader::networkComponent()
                 " Component { id: comp; NW.Rect120x60 {} }\n"
                 " Loader { sourceComponent: comp } }")
             , dataDirectory());
+    QTRY_COMPARE(component.status(), QQmlComponent::Ready);
 
     QQuickItem *item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
@@ -488,6 +489,7 @@ void tst_QQuickLoader::failNetworkRequest()
 
     QQmlComponent component(&engine);
     component.setData(QByteArray("import QtQuick 2.0\nLoader { property int did_load: 123; source: \"" SERVER_ADDR "/IDontExist.qml\"; onLoaded: did_load=456 }"), QUrl(QString(SERVER_ADDR "/dummy.qml")));
+    QTRY_COMPARE(component.status(), QQmlComponent::Ready);
     QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create());
     QVERIFY(loader != 0);
 
diff --git a/tests/auto/quick/qquickmousearea/data/changeAxis.qml b/tests/auto/quick/qquickmousearea/data/changeAxis.qml
index cf791df31d..4463f467a2 100644
--- a/tests/auto/quick/qquickmousearea/data/changeAxis.qml
+++ b/tests/auto/quick/qquickmousearea/data/changeAxis.qml
@@ -16,7 +16,7 @@ Rectangle {
             objectName: "mouseregion"
             anchors.fill: parent
             drag.target: blackRect
-            drag.axis: blackRect.x <= 75 ? Drag.XandYAxis : Drag.YAxis
+            drag.axis: blackRect.x <= 75 ? Drag.XAndYAxis : Drag.YAxis
          }
      }
  }
diff --git a/tests/auto/quick/qquickmousearea/data/dragging.qml b/tests/auto/quick/qquickmousearea/data/dragging.qml
index d9b6ac4083..4e0dbe6277 100644
--- a/tests/auto/quick/qquickmousearea/data/dragging.qml
+++ b/tests/auto/quick/qquickmousearea/data/dragging.qml
@@ -18,7 +18,7 @@ Rectangle {
             objectName: "mouseregion"
             anchors.fill: parent
             drag.target: blackRect
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: whiteRect.width-blackRect.width
             drag.minimumY: 0
diff --git a/tests/auto/quick/qquickmousearea/data/dragproperties.qml b/tests/auto/quick/qquickmousearea/data/dragproperties.qml
index 421dfe26b7..d8d7b3bb6e 100644
--- a/tests/auto/quick/qquickmousearea/data/dragproperties.qml
+++ b/tests/auto/quick/qquickmousearea/data/dragproperties.qml
@@ -18,7 +18,7 @@ Rectangle {
             objectName: "mouseregion"
             anchors.fill: parent
             drag.target: blackRect
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: whiteRect.width-blackRect.width
             drag.minimumY: 0
diff --git a/tests/auto/quick/qquickmousearea/data/dragreset.qml b/tests/auto/quick/qquickmousearea/data/dragreset.qml
index d7949f9139..3259dcf87d 100644
--- a/tests/auto/quick/qquickmousearea/data/dragreset.qml
+++ b/tests/auto/quick/qquickmousearea/data/dragreset.qml
@@ -18,7 +18,7 @@ Rectangle {
             objectName: "mouseregion"
             anchors.fill: parent
             drag.target: haveTarget ? blackRect : undefined
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: whiteRect.width-blackRect.width
             drag.minimumY: 0
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index 3c89ad4908..76768ee395 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -150,7 +150,7 @@ void tst_QQuickMouseArea::dragProperties()
     QCOMPARE(targetSpy.count(),1);
 
     // axis
-    QCOMPARE(drag->axis(), QQuickDrag::XandYAxis);
+    QCOMPARE(drag->axis(), QQuickDrag::XAndYAxis);
     QSignalSpy axisSpy(drag, SIGNAL(axisChanged()));
     drag->setAxis(QQuickDrag::XAxis);
     QCOMPARE(drag->axis(), QQuickDrag::XAxis);
@@ -1285,7 +1285,6 @@ void tst_QQuickMouseArea::pressedMultipleButtons()
 
     QPoint point(10,10);
 
-    int prevButtons = 0;
     for (int i = 0; i < buttons.count(); ++i) {
         int btns = buttons.at(i);
 
@@ -1294,8 +1293,6 @@ void tst_QQuickMouseArea::pressedMultipleButtons()
 
         QCOMPARE(mouseArea->pressed(), pressed.at(i));
         QCOMPARE(mouseArea->pressedButtons(), pressedButtons.at(i));
-
-        prevButtons = buttons.at(i);
     }
 
     QTest::mousePress(view, Qt::NoButton, 0, point);
@@ -1344,7 +1341,7 @@ void tst_QQuickMouseArea::changeAxis()
     QTRY_VERIFY(drag->active());
     QCOMPARE(blackRect->x(), 72.0);
     QCOMPARE(blackRect->y(), 72.0);
-    QCOMPARE(drag->axis(), QQuickDrag::XandYAxis);
+    QCOMPARE(drag->axis(), QQuickDrag::XAndYAxis);
 
     /* When blackRect.x becomes bigger than 75, the drag axis is changed to
      * Drag.YAxis by the QML code. Verify that this happens, and that the drag
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index dc0f31d56a..4a7d4a279d 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1798,7 +1798,7 @@ void tst_QQuickPathView::maximumFlickVelocity()
     flick(window, QPoint(200,10), QPoint(10,10), 180);
     QVERIFY(pathview->isMoving());
     QVERIFY(pathview->isFlicking());
-    QTRY_VERIFY(!pathview->isMoving());
+    QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
 
     double dist1 = 100 - pathview->offset();
 
@@ -1807,7 +1807,7 @@ void tst_QQuickPathView::maximumFlickVelocity()
     flick(window, QPoint(200,10), QPoint(10,10), 180);
     QVERIFY(pathview->isMoving());
     QVERIFY(pathview->isFlicking());
-    QTRY_VERIFY(!pathview->isMoving());
+    QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
 
     double dist2 = 100 - pathview->offset();
 
@@ -1816,7 +1816,7 @@ void tst_QQuickPathView::maximumFlickVelocity()
     flick(window, QPoint(200,10), QPoint(10,10), 180);
     QVERIFY(pathview->isMoving());
     QVERIFY(pathview->isFlicking());
-    QTRY_VERIFY(!pathview->isMoving());
+    QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
 
     double dist3 = 100 - pathview->offset();
 
diff --git a/tests/auto/quick/qquickpincharea/data/pinchproperties.qml b/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
index 6665e2f597..37d706fc8e 100644
--- a/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
+++ b/tests/auto/quick/qquickpincharea/data/pinchproperties.qml
@@ -22,7 +22,7 @@ Rectangle {
             objectName: "pincharea"
             anchors.fill: parent
             pinch.target: blackRect
-            pinch.dragAxis: Drag.XandYAxis
+            pinch.dragAxis: Drag.XAndYAxis
             pinch.minimumX: 0
             pinch.maximumX: whiteRect.width-blackRect.width
             pinch.minimumY: 0
diff --git a/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml b/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml
index 7d5d88a5bd..292838ed2a 100644
--- a/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml
+++ b/tests/auto/quick/qquickpincharea/data/transformedPinchArea.qml
@@ -24,7 +24,7 @@ Rectangle {
                 property bool pinching: false
 
                 pinch.target: rect
-                pinch.dragAxis: Drag.XandYAxis
+                pinch.dragAxis: Drag.XAndYAxis
                 onPinchStarted: pinching = true
                 onPinchFinished: pinching = false
             }
diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
index b3147067b0..4ba9e50c26 100644
--- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
+++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
@@ -108,7 +108,7 @@ void tst_QQuickPinchArea::pinchProperties()
     QCOMPARE(targetSpy.count(),1);
 
     // axis
-    QCOMPARE(pinch->axis(), QQuickPinch::XandYAxis);
+    QCOMPARE(pinch->axis(), QQuickPinch::XAndYAxis);
     QSignalSpy axisSpy(pinch, SIGNAL(dragAxisChanged()));
     pinch->setAxis(QQuickPinch::XAxis);
     QCOMPARE(pinch->axis(), QQuickPinch::XAxis);
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
index b9a18eec01..baba59a1aa 100644
--- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
+++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
@@ -1722,111 +1722,109 @@ void tst_qquickpositioners::test_flow_implicit_resize()
     delete window;
 }
 
-QString warningMessage;
-
-void interceptWarnings(QtMsgType type, const QMessageLogContext &, const QString &msg)
-{
-    Q_UNUSED( type );
-    warningMessage = msg;
-}
-
 void tst_qquickpositioners::test_conflictinganchors()
 {
-    QtMessageHandler oldMsgHandler = qInstallMessageHandler(interceptWarnings);
+    QQmlTestMessageHandler messageHandler;
     QQmlEngine engine;
     QQmlComponent component(&engine);
 
     component.setData("import QtQuick 2.0\nColumn { Item { width: 100; height: 100; } }", QUrl::fromLocalFile(""));
     QQuickItem *item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nRow { Item { width: 100; height: 100; } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nGrid { Item { width: 100; height: 100; } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nFlow { Item { width: 100; height: 100; } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nColumn { Item { width: 100; height: 100; anchors.top: parent.top } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nColumn { Item { width: 100; height: 100; anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nColumn { Item { width: 100; height: 100; anchors.left: parent.left } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
-    warningMessage.clear();
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nRow { Item { width: 100; height: 100; anchors.left: parent.left } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nRow { width: 100; height: 100; Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nRow { Item { width: 100; height: 100; anchors.top: parent.top } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QVERIFY(warningMessage.isEmpty());
-    warningMessage.clear();
+    QVERIFY2(messageHandler.messages().isEmpty(), qPrintable(messageHandler.messageString()));
     delete item;
 
     component.setData("import QtQuick 2.0\nGrid { Item { width: 100; height: 100; anchors.horizontalCenter: parent.horizontalCenter } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nGrid { Item { width: 100; height: 100; anchors.centerIn: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function."));
-    warningMessage.clear();
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nFlow { Item { width: 100; height: 100; anchors.verticalCenter: parent.verticalCenter } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function."));
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function."));
+    messageHandler.clear();
     delete item;
 
     component.setData("import QtQuick 2.0\nFlow {  width: 100; height: 100; Item { anchors.fill: parent } }", QUrl::fromLocalFile(""));
     item = qobject_cast<QQuickItem*>(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function."));
-    qInstallMessageHandler(oldMsgHandler);
+    QCOMPARE(messageHandler.messages().size(), 1);
+    QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function."));
     delete item;
 }
 
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index ea2ad71bfc..f8332d661d 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -2139,6 +2139,8 @@ void tst_qquicktextedit::positionAt()
     case QQuickTextEdit::AlignRight:
         xoff = texteditObject->width() - secondLine.naturalTextWidth();
         break;
+    case QQuickTextEdit::AlignJustify:
+        break;
     }
     int pos = texteditObject->positionAt(texteditObject->width()/2, y0);
 
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index 94452b142b..aa20967fa3 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -195,9 +195,8 @@ void tst_QQuickView::errors()
 {
     QQuickView *view = new QQuickView;
     QVERIFY(view);
-    QtMessageHandler old = qInstallMessageHandler(silentErrorsMsgHandler);
+    QQmlTestMessageHandler messageHandler;
     view->setSource(testFileUrl("error1.qml"));
-    qInstallMessageHandler(old);
     QVERIFY(view->status() == QQuickView::Error);
     QVERIFY(view->errors().count() == 1);
     delete view;
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 57c016a16a..eaefb1f9d6 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -46,6 +46,8 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
 #include <QtCore/QTextStream>
+#include <QtCore/QDebug>
+#include <QtCore/QMutexLocker>
 
 QQmlDataTest *QQmlDataTest::m_instance = 0;
 
@@ -107,3 +109,30 @@ QByteArray QQmlDataTest::msgComponentError(const QQmlComponent &c,
     }
     return result.toLocal8Bit();
 }
+
+Q_GLOBAL_STATIC(QMutex, qQmlTestMessageHandlerMutex)
+
+QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = 0;
+
+void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &, const QString &message)
+{
+    QMutexLocker locker(qQmlTestMessageHandlerMutex());
+    if (QQmlTestMessageHandler::m_instance)
+        QQmlTestMessageHandler::m_instance->m_messages.push_back(message);
+}
+
+QQmlTestMessageHandler::QQmlTestMessageHandler()
+{
+    QMutexLocker locker(qQmlTestMessageHandlerMutex());
+    Q_ASSERT(!QQmlTestMessageHandler::m_instance);
+    QQmlTestMessageHandler::m_instance = this;
+    m_oldHandler = qInstallMessageHandler(messageHandler);
+}
+
+QQmlTestMessageHandler::~QQmlTestMessageHandler()
+{
+    QMutexLocker locker(qQmlTestMessageHandlerMutex());
+    Q_ASSERT(QQmlTestMessageHandler::m_instance);
+    qInstallMessageHandler(m_oldHandler);
+    QQmlTestMessageHandler::m_instance = 0;
+}
diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h
index 4a5c9176c6..eff54b30d9 100644
--- a/tests/auto/shared/util.h
+++ b/tests/auto/shared/util.h
@@ -45,6 +45,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QUrl>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
 #include <QtTest/QTest>
 
 QT_FORWARD_DECLARE_CLASS(QQmlComponent)
@@ -87,4 +88,24 @@ private:
     QString m_directory;
 };
 
+class QQmlTestMessageHandler
+{
+    Q_DISABLE_COPY(QQmlTestMessageHandler)
+public:
+    QQmlTestMessageHandler();
+    ~QQmlTestMessageHandler();
+
+    const QStringList &messages() const { return m_messages; }
+    const QString messageString() const { return m_messages.join(QLatin1Char('\n')); }
+
+    void clear() { m_messages.clear(); }
+
+private:
+    static void messageHandler(QtMsgType, const QMessageLogContext &, const QString &message);
+
+    static QQmlTestMessageHandler *m_instance;
+    QStringList m_messages;
+    QtMessageHandler m_oldHandler;
+};
+
 #endif // QQMLTESTUTILS_H
diff --git a/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
index a865ae4163..9cd2236b28 100644
--- a/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
+++ b/tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
@@ -90,7 +90,7 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
             drag.target: blueSquare
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: box.width - parent.width
             drag.minimumY: 0
diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index fb684685c3..587d9d47e9 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -43,9 +43,6 @@
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qjsengine.h>
 
-
-Q_DECLARE_METATYPE(QJSValue)
-
 class tst_QJSEngine : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
index 738bdf619a..7b2dc3a08d 100644
--- a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
@@ -43,8 +43,6 @@
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qjsengine.h>
 
-Q_DECLARE_METATYPE(QJSValue)
-
 class tst_QJSValue : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/script/qjsvalue/qjsvalue.pro b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
index 8600ab470a..7aa864c12f 100644
--- a/tests/benchmarks/script/qjsvalue/qjsvalue.pro
+++ b/tests/benchmarks/script/qjsvalue/qjsvalue.pro
@@ -1,7 +1,6 @@
 CONFIG += testcase
 TEMPLATE = app
 TARGET = tst_bench_qjsvalue
-DEPENDPATH += .
 INCLUDEPATH += .
 macx:CONFIG -= app_bundle
 CONFIG += release
diff --git a/tests/manual/scenegraph_lancelot/data/images/transform.qml b/tests/manual/scenegraph_lancelot/data/images/transform.qml
index be711ba80f..5a02724585 100644
--- a/tests/manual/scenegraph_lancelot/data/images/transform.qml
+++ b/tests/manual/scenegraph_lancelot/data/images/transform.qml
@@ -24,7 +24,7 @@ Rectangle {
             MouseArea {
                 anchors.fill: parent
                 drag.target: parent
-                drag.axis: Drag.XandYAxis
+                drag.axis: Drag.XAndYAxis
                 drag.minimumX: 0
                 drag.maximumX: wooohooo.width - parent.width
                 drag.minimumY: 0
diff --git a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
index 46fa6f5583..e2a3ca7a0c 100644
--- a/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
+++ b/tests/manual/scenegraph_lancelot/data/shaders/source/rect.qml
@@ -44,7 +44,7 @@ Item {
         MouseArea {
             anchors.fill: parent
             drag.target: parent
-            drag.axis: Drag.XandYAxis
+            drag.axis: Drag.XAndYAxis
             drag.minimumX: 0
             drag.maximumX: parent.parent.width - width
             drag.minimumY: 0
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index f0cc1bf103..b777e0da75 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -1,5 +1,7 @@
 QT += qml qml-private quick-private core-private
 
+CONFIG += qpa_minimal_plugin
+
 SOURCES += \
     main.cpp \
     qmlstreamwriter.cpp
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index a90870aa0b..1121f02dba 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -476,7 +476,7 @@ int main(int argc, char ** argv)
             QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
             component->loadUrl(options.file);
             if ( !component->isReady() ) {
-                qFatal("%s", qPrintable(component->errorString()));
+                qWarning("%s", qPrintable(component->errorString()));
                 return -1;
             }