896 files changed, 1302 insertions, 1314 deletions

diff --git a/.gitignore b/.gitignore
index e1bf85aa29..4c8776bc5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,6 @@
 # This file is used to ignore files which are generated in the Qt build system
 # ----------------------------------------------------------------------------
 
-examples/*/*/*
-!examples/*/*/*[.]*
-!examples/*/*/README
-examples/*/*/*[.]app
-!examples/declarative/*
-!examples/tutorials/*
-!examples/tutorials/*/*
-!examples/ja_JP/*/*
-demos/*/*
-!demos/spectrum/*
-demos/spectrum/bin
-!demos/*/*[.]*
-demos/*/*[.]app
-!demos/declarative/*
 config.tests/*/*/*
 !config.tests/*/*/*[.]*
 config.tests/*/*/*[.]app
@@ -273,4 +259,4 @@ tests/auto/*/*.o
 tests/auto/*/*.moc
 tests/auto/*/*/*.o
 tests/auto/*/*/*.moc
-src/declarative/generated/
\ No newline at end of file
+src/declarative/generated/
diff --git a/doc/config/qtquick.qdocconf b/doc/config/qtquick.qdocconf
index 69e860919e..3f4645aeaa 100644
--- a/doc/config/qtquick.qdocconf
+++ b/doc/config/qtquick.qdocconf
@@ -19,7 +19,8 @@ headerdirs += ../src \
 imagedirs += ../src/images \
 
 sourcedirs += ../src \
-              ../../src
+              ../../src \
+              ../../examples
 
 #indexes = $QT5DOC/doc/html/qt.index
 
diff --git a/doc/src/examples/examples-groups.qdoc b/doc/src/examples/examples-groups.qdoc
index 9a6dafa435..a346794b96 100644
--- a/doc/src/examples/examples-groups.qdoc
+++ b/doc/src/examples/examples-groups.qdoc
@@ -32,15 +32,6 @@
     \brief This is an internationalization example
 */
 /*!
-    \title QML Examples - Shader Effects
-    \example declarative/shadereffects
-    \image qml-shadereffects-example.png
-    \brief This is a shader effects example
-
-    This example demonstrates a couple of visual effects that you can perform
-    with shaders in QtQuick 2.0
-*/
-/*!
     \title QML Examples - Positioners
     \example declarative/positioners
     \brief This is a positioners example
@@ -49,16 +40,6 @@
     This example demonstrates the positioners and some of their animations.
 */
 /*!
-    \title QML Examples - Animation
-    \example declarative/animation
-    \brief This is a collection of QML examples
-    \image qml-animations-example.png
-
-    This is a collection of small QML examples relating to animation. Each example is
-    a small QML file, usually containing or emphasizing a particular element or
-    feature. You can run and observe the behavior of each example.
-*/
-/*!
     \title QML Examples - Image Elements
     \example declarative/imageelements
     \brief This is a collection of QML examples
diff --git a/doc/src/examples/examples-toys.qdoc b/doc/src/examples/examples-toys.qdoc
index f076c1de6c..7414579e19 100644
--- a/doc/src/examples/examples-toys.qdoc
+++ b/doc/src/examples/examples-toys.qdoc
@@ -27,13 +27,6 @@
 
 
 /*!
-    \title QML Example - Calculator
-    \example declarative/calculator
-    \brief This is an example application written in QML.
-    \image qml-calculator-demo-small.png
-*/
-
-/*!
     \title QML Example - Samegame
     \example declarative/samegame
     \brief This example demonstrates creating a game with javascript game logic.
diff --git a/examples/HACKING b/examples/HACKING
new file mode 100644
index 0000000000..a3aa3e9a77
--- /dev/null
+++ b/examples/HACKING
@@ -0,0 +1,23 @@
+Some guidelines for QtDeclarative examples
+
+Snippets
+---
+Snippets are snatches of QML code that won't even run on their own. They don't belong here, they belong in doc/src/snippets. They should be contained in files that will compile on their own, for automated syntax validation, but don't have to look like anything.
+
+Examples
+---
+
+Examples are large blocks of QML code that demonstrate a feature. You should be able to launch an example and visually see the feature take effect. Examples should be written in a small form, and should automatically activate any features. Ideally, when you run an example, you see the feature demonstrate itself over and over until you get bored and close the application using your platform's close window mechanism. Examples shouldn't contain their own close buttons or start screen, explanatory text should be kept to a minimum (show, not tell), and reserve interaction for demonstrating interactive elements). The code should be held to a high level of quality, and should be understandable by people new to QML.
+
+Unless the demonstrated feature uses it, assume no interface devices other than a screen that can show a 320x480 rectangle and a generic pointing device (with the shared subset of mouse/touch functionality).
+
+Groups of similar examples should be placed in one folder with a single launcher application, which uses the QtQuick.Examples module for common components.
+
+The example, or launcher application in case of groups, should contain a qdoc comment explaining the example. The example or launcher should be buildable as a full C++ application and runnable with the standard qml file launcher.
+
+Demos
+---
+
+Demos are examples of creating full applications using QML. They should fit both a desktop and a mobile form factor, they should have their own start screen and method of exiting the application. They should be at a level of quality that you'd be comfortable submitting them to an app store for a platform of the appropriate hardware (screen size, input methods, etc.). The code should be written to a level that is easily understood and modified by a QML expert.
+
+Demos should have a qdoc file in their directory explaining the demo at a high level. The demo should be buildable as a full C++ application and preferably runnable with the standard qml file launcher.
diff --git a/examples/declarative/README b/examples/README
index 56c48d71fb..aba1e2cc0d 100644
--- a/examples/declarative/README
+++ b/examples/README
@@ -8,6 +8,5 @@ and loading data models from C++ and interacting with them.
 Mostof these examples can be viewed directly with the
 QML viewer utility, without requiring compilation.
 
-
 Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
deleted file mode 100644
index 883c0afe2d..0000000000
--- a/examples/declarative/declarative.pro
+++ /dev/null
@@ -1,38 +0,0 @@
-TEMPLATE = subdirs
-
-# These examples contain some C++ and need to be built
-SUBDIRS = \
-   cppextensions \
-   minehunt \
-   modelviews \
-   painteditem \
-   tutorials \
-   script
-
-# These examples contain no C++ and can simply be copied
-sources.files = \
-   animation \
-   calculator \
-   cppextensions \
-   flickr \
-   i18n \
-   imageelements \
-   keyinteraction \
-   photoviewer \
-   positioners \
-   rssnews \
-   samegame \
-   snake \
-   sqllocalstorage \
-   text \
-   threading \
-   touchinteraction \
-   toys \
-   twitter \
-   ui-components \
-   webbrowser \
-   xml
-
-
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative
-INSTALLS += sources
diff --git a/examples/declarative/imageelements/borderimage.qml b/examples/declarative/imageelements/borderimage.qml
deleted file mode 100644
index 3dd5d1d9bb..0000000000
--- a/examples/declarative/imageelements/borderimage.qml
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** 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 Nokia Corporation 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"
-
-Rectangle {
-    id: page
-    width: 1030; height: 540
-
-    Grid {
-        anchors.centerIn: parent; spacing: 20
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-    }
-}
diff --git a/examples/declarative/imageelements/image.qml b/examples/declarative/imageelements/image.qml
deleted file mode 100644
index 4ca26c1630..0000000000
--- a/examples/declarative/imageelements/image.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** 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 Nokia Corporation 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"
-
-Rectangle {
-    width: 490
-    height: 285
-
-    Grid {
-        property int cellWidth: (width - (spacing * (columns - 1))) / columns
-        property int cellHeight: (height - (spacing * (rows - 1))) / rows
-
-        anchors.fill: parent
-        anchors.margins: 30
-
-        columns: 3
-        rows: 2
-        spacing: 30
-
-        ImageCell { mode: Image.Stretch; caption: "Stretch" }
-        ImageCell { mode: Image.PreserveAspectFit; caption: "PreserveAspectFit" }
-        ImageCell { mode: Image.PreserveAspectCrop; caption: "PreserveAspectCrop" }
-
-        ImageCell { mode: Image.Tile; caption: "Tile" }
-        ImageCell { mode: Image.TileHorizontally; caption: "TileHorizontally" }
-        ImageCell { mode: Image.TileVertically; caption: "TileVertically" }
-    }
-}
diff --git a/examples/declarative/shadereffects/shadereffects.qml b/examples/declarative/shadereffects/shadereffects.qml
deleted file mode 100644
index 842e42b89f..0000000000
--- a/examples/declarative/shadereffects/shadereffects.qml
+++ /dev/null
@@ -1,300 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Declarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-
-Image {
-    width: 640
-    height: 360
-    source: "../snake/content/pics/background.png"
-
-    ShaderEffectSource {
-        id: theSource
-        sourceItem: theItem
-        smooth: true
-    }
-
-    function saturate(x) {
-        return Math.min(Math.max(x, 0), 1)
-    }
-
-    function sliderToColor(x) {
-        return Qt.rgba(saturate(Math.max(2 - 6 * x, 6 * x - 4)),
-                        saturate(Math.min(6 * x, 4 - 6 * x)),
-                        saturate(Math.min(6 * x - 2, 6 - 6 * x)))
-    }
-
-    Grid {
-        anchors.centerIn: parent
-        columns: 3
-
-        Item {
-            id: theItem
-            width: 180
-            height: 180
-            ListView {
-                anchors.centerIn: parent
-                width: 160
-                height: 140
-                clip: true
-                snapMode: ListView.SnapOneItem
-                model: VisualItemModel {
-                    Text {
-                        width: 160
-                        height: 140
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignVCenter
-                        font.pixelSize: 120
-                        font.family: "Times"
-                        color: "blue"
-                        text: "Qt"
-                    }
-                    Image {
-                        width: 160
-                        height: 140
-                        source: "content/qt-logo.png"
-                        smooth: true
-                    }
-                    Image {
-                        width: 160
-                        height: 140
-                        source: "content/face-smile.png"
-                        smooth: true
-                    }
-                }
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property real amplitude: 0.04 * wobbleSlider.value
-            property real frequency: 20
-            property real time: 0
-            NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
-            fragmentShader:
-                "uniform lowp float qt_Opacity;" +
-                "uniform highp float amplitude;" +
-                "uniform highp float frequency;" +
-                "uniform highp float time;" +
-                "uniform sampler2D source;" +
-                "varying highp vec2 qt_TexCoord0;" +
-                "void main() {" +
-                "    highp vec2 p = sin(time + frequency * qt_TexCoord0);" +
-                "    gl_FragColor = texture2D(source, qt_TexCoord0 + amplitude * vec2(p.y, -p.x)) * qt_Opacity;" +
-                "}"
-            Slider {
-                id: wobbleSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property variant shadow: ShaderEffectSource {
-                smooth: true
-                sourceItem: ShaderEffect {
-                    width: theItem.width
-                    height: theItem.height
-                    property variant delta: Qt.size(0.0, 1.0 / height)
-                    property variant source: ShaderEffectSource {
-                        smooth: true
-                        sourceItem: ShaderEffect {
-                            width: theItem.width
-                            height: theItem.height
-                            property variant delta: Qt.size(1.0 / width, 0.0)
-                            property variant source: theSource
-                            fragmentShader: "
-                                uniform lowp float qt_Opacity;
-                                uniform sampler2D source;
-                                uniform highp vec2 delta;
-                                varying highp vec2 qt_TexCoord0;
-                                void main() {
-                                    gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
-                                                 + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
-                                                 + 0.2466 * texture2D(source, qt_TexCoord0)
-                                                 + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
-                                                 + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
-                                }"
-                        }
-                    }
-                    fragmentShader: "
-                        uniform lowp float qt_Opacity;
-                        uniform sampler2D source;
-                        uniform highp vec2 delta;
-                        varying highp vec2 qt_TexCoord0;
-                        void main() {
-                            gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
-                                         + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
-                                         + 0.2466 * texture2D(source, qt_TexCoord0)
-                                         + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
-                                         + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
-                        }"
-                }
-            }
-            property real angle: 0
-            property variant offset: Qt.point(15.0 * Math.cos(angle), 15.0 * Math.sin(angle))
-            NumberAnimation on angle { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 6000 }
-            property variant delta: Qt.size(offset.x / width, offset.y / height)
-            property real darkness: shadowSlider.value
-            fragmentShader: "
-                uniform lowp float qt_Opacity;
-                uniform highp vec2 offset;
-                uniform sampler2D source;
-                uniform sampler2D shadow;
-                uniform highp float darkness;
-                uniform highp vec2 delta;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 fg = texture2D(source, qt_TexCoord0);
-                    lowp vec4 bg = texture2D(shadow, qt_TexCoord0 + delta);
-                    gl_FragColor = (fg + vec4(0., 0., 0., darkness * bg.a) * (1. - fg.a)) * qt_Opacity;
-                }"
-            Slider {
-                id: shadowSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property variant delta: Qt.size(0.5 / width, 0.5 / height)
-            fragmentShader: "
-                uniform sampler2D source;
-                uniform highp vec2 delta;
-                uniform highp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 tl = texture2D(source, qt_TexCoord0 - delta);
-                    lowp vec4 tr = texture2D(source, qt_TexCoord0 + vec2(delta.x, -delta.y));
-                    lowp vec4 bl = texture2D(source, qt_TexCoord0 - vec2(delta.x, -delta.y));
-                    lowp vec4 br = texture2D(source, qt_TexCoord0 + delta);
-                    lowp vec4 gx = (tl + bl) - (tr + br);
-                    lowp vec4 gy = (tl + tr) - (bl + br);
-                    gl_FragColor.xyz = vec3(0.);
-                    gl_FragColor.w = clamp(dot(sqrt(gx * gx + gy * gy), vec4(1.)), 0., 1.) * qt_Opacity;
-                }"
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            property variant source: theSource
-            property color tint: sliderToColor(colorizeSlider.value)
-            fragmentShader: "
-                uniform sampler2D source;
-                uniform lowp vec4 tint;
-                uniform lowp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    lowp vec4 c = texture2D(source, qt_TexCoord0);
-                    lowp float lo = min(min(c.x, c.y), c.z);
-                    lowp float hi = max(max(c.x, c.y), c.z);
-                    gl_FragColor = qt_Opacity * vec4(mix(vec3(lo), vec3(hi), tint.xyz), c.w);
-                }"
-            Slider {
-                id: colorizeSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-        ShaderEffect {
-            width: 180
-            height: 180
-            mesh: Qt.size(10, 10)
-            property variant source: theSource
-            property real bend: 0
-            property real minimize: 0
-            property real side: genieSlider.value
-            SequentialAnimation on bend {
-                loops: Animation.Infinite
-                NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1600 }
-                NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1000 }
-            }
-            SequentialAnimation on minimize {
-                loops: Animation.Infinite
-                PauseAnimation { duration: 300 }
-                NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1000 }
-                NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
-                PauseAnimation { duration: 1300 }
-            }
-            vertexShader: "
-                uniform highp mat4 qt_Matrix;
-                uniform highp float bend;
-                uniform highp float minimize;
-                uniform highp float side;
-                uniform highp float width;
-                uniform highp float height;
-                attribute highp vec4 qt_Vertex;
-                attribute highp vec2 qt_MultiTexCoord0;
-                varying highp vec2 qt_TexCoord0;
-                void main() {
-                    qt_TexCoord0 = qt_MultiTexCoord0;
-                    highp vec4 pos = qt_Vertex;
-                    pos.y = mix(qt_Vertex.y, height, minimize);
-                    highp float t = pos.y / height;
-                    t = (3. - 2. * t) * t * t;
-                    pos.x = mix(qt_Vertex.x, side * width, t * bend);
-                    gl_Position = qt_Matrix * pos;
-                }"
-            Slider {
-                id: genieSlider
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                height: 40
-            }
-        }
-    }
-}
diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/declarative/tutorials/tutorials.pro
deleted file mode 100644
index 0a82c1e704..0000000000
--- a/examples/declarative/tutorials/tutorials.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    extending
-
diff --git a/examples/declarative/tutorials/tutorials.qmlproject b/examples/declarative/tutorials/tutorials.qmlproject
deleted file mode 100644
index 2bb4016996..0000000000
--- a/examples/declarative/tutorials/tutorials.qmlproject
+++ /dev/null
@@ -1,14 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
diff --git a/examples/declarative/calculator/content/Button.qml b/examples/demos/calculator/CalculatorCore/Button.qml
index 6b480eb9b8..872fc81174 100644
--- a/examples/declarative/calculator/content/Button.qml
+++ b/examples/demos/calculator/CalculatorCore/Button.qml
@@ -72,7 +72,7 @@ BorderImage {
         id: mouseArea
         anchors.fill: parent
         onClicked: {
-            doOp(operation)
+            window.doOp(operation)
             button.clicked()
         }
     }
diff --git a/examples/declarative/calculator/content/Display.qml b/examples/demos/calculator/CalculatorCore/Display.qml
index 3333484971..3333484971 100644
--- a/examples/declarative/calculator/content/Display.qml
+++ b/examples/demos/calculator/CalculatorCore/Display.qml
diff --git a/examples/declarative/calculator/content/calculator.js b/examples/demos/calculator/CalculatorCore/calculator.js
index 7c363c7f30..e2b5692cf3 100644
--- a/examples/declarative/calculator/content/calculator.js
+++ b/examples/demos/calculator/CalculatorCore/calculator.js
@@ -15,6 +15,10 @@ function disabled(op) {
 }
 
 function doOperation(op) {
+    if (op == '*')//Keyboard Aliases
+        op = multiplication;
+    if (op == '/')
+        op = division;
     if (disabled(op)) {
         return
     }
diff --git a/examples/declarative/calculator/content/images/button-.png b/examples/demos/calculator/CalculatorCore/images/button-.png
index 544e514536..544e514536 100644
--- a/examples/declarative/calculator/content/images/button-.png
+++ b/examples/demos/calculator/CalculatorCore/images/button-.png
diff --git a/examples/declarative/calculator/content/images/button-blue.png b/examples/demos/calculator/CalculatorCore/images/button-blue.png
index 5f92de32d0..5f92de32d0 100644
--- a/examples/declarative/calculator/content/images/button-blue.png
+++ b/examples/demos/calculator/CalculatorCore/images/button-blue.png
diff --git a/examples/declarative/calculator/content/images/button-green.png b/examples/demos/calculator/CalculatorCore/images/button-green.png
index 36c93914c7..36c93914c7 100644
--- a/examples/declarative/calculator/content/images/button-green.png
+++ b/examples/demos/calculator/CalculatorCore/images/button-green.png
diff --git a/examples/declarative/calculator/content/images/button-purple.png b/examples/demos/calculator/CalculatorCore/images/button-purple.png
index 347cbbea9d..347cbbea9d 100644
--- a/examples/declarative/calculator/content/images/button-purple.png
+++ b/examples/demos/calculator/CalculatorCore/images/button-purple.png
diff --git a/examples/declarative/calculator/content/images/button-red.png b/examples/demos/calculator/CalculatorCore/images/button-red.png
index 3b335891ae..3b335891ae 100644
--- a/examples/declarative/calculator/content/images/button-red.png
+++ b/examples/demos/calculator/CalculatorCore/images/button-red.png
diff --git a/examples/declarative/calculator/content/images/display.png b/examples/demos/calculator/CalculatorCore/images/display.png
index 9507f4382e..9507f4382e 100644
--- a/examples/declarative/calculator/content/images/display.png
+++ b/examples/demos/calculator/CalculatorCore/images/display.png
diff --git a/examples/declarative/calculator/content/qmldir b/examples/demos/calculator/CalculatorCore/qmldir
index a926b93fac..a926b93fac 100644
--- a/examples/declarative/calculator/content/qmldir
+++ b/examples/demos/calculator/CalculatorCore/qmldir
diff --git a/examples/demos/calculator/calculator-desktop.qml b/examples/demos/calculator/calculator-desktop.qml
new file mode 100644
index 0000000000..7e72f50beb
--- /dev/null
+++ b/examples/demos/calculator/calculator-desktop.qml
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import "CalculatorCore"
+import "CalculatorCore/calculator.js" as CalcEngine
+
+Rectangle {
+    id: window
+
+    width: 640; height: 480
+    color: "#282828"
+
+    property string rotateLeft: "\u2939"
+    property string rotateRight: "\u2935"
+    property string leftArrow: "\u2190"
+    property string division : "\u00f7"
+    property string multiplication : "\u00d7"
+    property string squareRoot : "\u221a"
+    property string plusminus : "\u00b1"
+
+    function doOp(operation) { CalcEngine.doOperation(operation) }
+    focus: true
+    Keys.onPressed: doOp(event.text);
+
+    Item {
+        id: main
+        width: 640
+        height: 480
+        anchors.centerIn: parent
+
+        Column {
+            id: box; spacing: 8
+
+            anchors { fill: parent; topMargin: 6; bottomMargin: 6; leftMargin: 6; rightMargin: 6 }
+
+            Display {
+                id: display
+                width: box.width-3
+                height: 64
+            }
+
+            Column {
+                id: column; spacing: 6
+
+                property real h: ((box.height - 72) / 6) - ((spacing * (6 - 1)) / 6)
+                property real w: (box.width / 4) - ((spacing * (4 - 1)) / 4)
+
+                Row {
+                    spacing: 6
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "Off" }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: leftArrow }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "C" }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: "AC" }
+                }
+
+                Row {
+                    spacing: 6
+                    property real w: (box.width / 4) - ((spacing * (4 - 1)) / 4)
+
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "mc" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "m+" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "m-" }
+                    Button { width: column.w; height: column.h; color: 'green'; operation: "mr" }
+                }
+
+                Grid {
+                    id: grid; rows: 5; columns: 5; spacing: 6
+
+                    property real w: (box.width / columns) - ((spacing * (columns - 1)) / columns)
+
+                    Button { width: grid.w; height: column.h; operation: "7"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "8"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "9"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: division }
+                    Button { width: grid.w; height: column.h; operation: squareRoot }
+                    Button { width: grid.w; height: column.h; operation: "4"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "5"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "6"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: multiplication }
+                    Button { width: grid.w; height: column.h; operation: "x^2" }
+                    Button { width: grid.w; height: column.h; operation: "1"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "2"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "3"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "-" }
+                    Button { width: grid.w; height: column.h; operation: "1/x" }
+                    Button { width: grid.w; height: column.h; operation: "0"; color: 'blue' }
+                    Button { width: grid.w; height: column.h; operation: "." }
+                    Button { width: grid.w; height: column.h; operation: plusminus }
+                    Button { width: grid.w; height: column.h; operation: "+" }
+                    Button { width: grid.w; height: column.h; operation: "="; color: 'red' }
+                }
+            }
+        }
+
+    }
+}
diff --git a/examples/declarative/calculator/calculator.qml b/examples/demos/calculator/calculator-mobile.qml
index e2d6679b89..b4fc372b39 100644
--- a/examples/declarative/calculator/calculator.qml
+++ b/examples/demos/calculator/calculator-mobile.qml
@@ -41,13 +41,13 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import "content"
-import "content/calculator.js" as CalcEngine
+import "CalculatorCore"
+import "CalculatorCore/calculator.js" as CalcEngine
 
 Rectangle {
     id: window
 
-    width: 360; height: 480
+    width: 320; height: 480
     color: "#282828"
 
     property string rotateLeft: "\u2939"
@@ -64,6 +64,7 @@ Rectangle {
         id: main
         state: "orientation " + Screen.orientation
 
+        //Note: Assumes a primarily portrait device
         property bool landscapeWindow: window.width > window.height 
         property real baseWidth: landscapeWindow ? window.height : window.width
         property real baseHeight: landscapeWindow ? window.width : window.height
diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro
new file mode 100644
index 0000000000..3bf3b8ca2f
--- /dev/null
+++ b/examples/demos/calculator/calculator.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
+qml.files = calculator-desktop.qml calculator-mobile.qml CalculatorCore
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
+INSTALLS += target qml
diff --git a/examples/demos/calculator/calculator.qdoc b/examples/demos/calculator/calculator.qdoc
new file mode 100644
index 0000000000..e94bdb4cfd
--- /dev/null
+++ b/examples/demos/calculator/calculator.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \title QML Demo - Calculator
+    \example declarative/calculator
+    \brief This is an example calculator application written in QML.
+    \image qml-calculator-demo-small.png
+
+    The Calculator demo implements a simple calculator in QML. It is written for desktop and portrait devices,
+    although on device it supports orientation changes.
+*/
+
diff --git a/examples/demos/calculator/main.cpp b/examples/demos/calculator/main.cpp
new file mode 100644
index 0000000000..c7f9b29952
--- /dev/null
+++ b/examples/demos/calculator/main.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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 <QGuiApplication>
+#include <QStringList>
+#include <QQuickView>
+#include <QDeclarativeEngine>
+
+void usage()
+{
+    printf("Pass -desktop to use the Desktop UI");
+    exit(0);
+}
+
+int main(int argc, char* argv[])
+{
+    QGuiApplication app(argc,argv);
+    QQuickView view;
+    QUrl launchFile = QUrl::fromLocalFile(QLatin1String("calculator-mobile.qml"));
+    if (app.arguments().contains(QLatin1String("-help")))
+        usage();
+    if (app.arguments().contains(QLatin1String("-desktop")))
+        launchFile =  QUrl::fromLocalFile(QLatin1String("calculator-desktop.qml"));
+    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
+    view.setSource(launchFile);
+    view.show();
+    return app.exec();
+}
+
diff --git a/examples/declarative/toys/clocks/clocks.qml b/examples/demos/clocks/clocks.qml
index 288e50c9eb..288e50c9eb 100644
--- a/examples/declarative/toys/clocks/clocks.qml
+++ b/examples/demos/clocks/clocks.qml
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/demos/clocks/content/Clock.qml
index 7f0e8cba83..7f0e8cba83 100644
--- a/examples/declarative/toys/clocks/content/Clock.qml
+++ b/examples/demos/clocks/content/Clock.qml
diff --git a/examples/declarative/animation/easing/content/QuitButton.qml b/examples/demos/clocks/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/animation/easing/content/QuitButton.qml
+++ b/examples/demos/clocks/content/QuitButton.qml
diff --git a/examples/declarative/toys/clocks/content/arrow.png b/examples/demos/clocks/content/arrow.png
index e437312217..e437312217 100644
--- a/examples/declarative/toys/clocks/content/arrow.png
+++ b/examples/demos/clocks/content/arrow.png
diff --git a/examples/declarative/toys/clocks/content/background.png b/examples/demos/clocks/content/background.png
index a885950862..a885950862 100644
--- a/examples/declarative/toys/clocks/content/background.png
+++ b/examples/demos/clocks/content/background.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png b/examples/demos/clocks/content/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
+++ b/examples/demos/clocks/content/center.png
diff --git a/examples/declarative/toys/clocks/content/clock-night.png b/examples/demos/clocks/content/clock-night.png
index cc7151a397..cc7151a397 100644
--- a/examples/declarative/toys/clocks/content/clock-night.png
+++ b/examples/demos/clocks/content/clock-night.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png b/examples/demos/clocks/content/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
+++ b/examples/demos/clocks/content/clock.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png b/examples/demos/clocks/content/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
+++ b/examples/demos/clocks/content/hour.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png b/examples/demos/clocks/content/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
+++ b/examples/demos/clocks/content/minute.png
diff --git a/examples/declarative/animation/easing/content/quit.png b/examples/demos/clocks/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/animation/easing/content/quit.png
+++ b/examples/demos/clocks/content/quit.png
diff --git a/examples/declarative/toys/clocks/content/second.png b/examples/demos/clocks/content/second.png
index 4aa9fb5e8e..4aa9fb5e8e 100644
--- a/examples/declarative/toys/clocks/content/second.png
+++ b/examples/demos/clocks/content/second.png
diff --git a/examples/declarative/toys/corkboards/content/Day.qml b/examples/demos/corkboards/content/Day.qml
index 7fe625c305..7fe625c305 100644
--- a/examples/declarative/toys/corkboards/content/Day.qml
+++ b/examples/demos/corkboards/content/Day.qml
diff --git a/examples/declarative/toys/corkboards/content/cork.jpg b/examples/demos/corkboards/content/cork.jpg
index 160bc002bf..160bc002bf 100644
--- a/examples/declarative/toys/corkboards/content/cork.jpg
+++ b/examples/demos/corkboards/content/cork.jpg
diff --git a/examples/declarative/toys/corkboards/content/note-yellow.png b/examples/demos/corkboards/content/note-yellow.png
index 8ddecc8b03..8ddecc8b03 100644
--- a/examples/declarative/toys/corkboards/content/note-yellow.png
+++ b/examples/demos/corkboards/content/note-yellow.png
diff --git a/examples/declarative/toys/corkboards/content/tack.png b/examples/demos/corkboards/content/tack.png
index cef2d1cd23..cef2d1cd23 100644
--- a/examples/declarative/toys/corkboards/content/tack.png
+++ b/examples/demos/corkboards/content/tack.png
diff --git a/examples/declarative/toys/corkboards/corkboards.qml b/examples/demos/corkboards/corkboards.qml
index dc3aa6b378..dc3aa6b378 100644
--- a/examples/declarative/toys/corkboards/corkboards.qml
+++ b/examples/demos/corkboards/corkboards.qml
diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
new file mode 100644
index 0000000000..abe718b910
--- /dev/null
+++ b/examples/demos/demos.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = calculator
diff --git a/examples/declarative/toys/dynamicscene/content/Button.qml b/examples/demos/dynamicscene/content/Button.qml
index 014692274a..014692274a 100644
--- a/examples/declarative/toys/dynamicscene/content/Button.qml
+++ b/examples/demos/dynamicscene/content/Button.qml
diff --git a/examples/declarative/toys/dynamicscene/content/GenericSceneItem.qml b/examples/demos/dynamicscene/content/GenericSceneItem.qml
index 0408aa87fb..0408aa87fb 100644
--- a/examples/declarative/toys/dynamicscene/content/GenericSceneItem.qml
+++ b/examples/demos/dynamicscene/content/GenericSceneItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/PaletteItem.qml b/examples/demos/dynamicscene/content/PaletteItem.qml
index e993f89989..e993f89989 100644
--- a/examples/declarative/toys/dynamicscene/content/PaletteItem.qml
+++ b/examples/demos/dynamicscene/content/PaletteItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/PerspectiveItem.qml b/examples/demos/dynamicscene/content/PerspectiveItem.qml
index f651369452..f651369452 100644
--- a/examples/declarative/toys/dynamicscene/content/PerspectiveItem.qml
+++ b/examples/demos/dynamicscene/content/PerspectiveItem.qml
diff --git a/examples/declarative/toys/dynamicscene/content/Sun.qml b/examples/demos/dynamicscene/content/Sun.qml
index b84516eecc..b84516eecc 100644
--- a/examples/declarative/toys/dynamicscene/content/Sun.qml
+++ b/examples/demos/dynamicscene/content/Sun.qml
diff --git a/examples/declarative/toys/dynamicscene/content/images/NOTE b/examples/demos/dynamicscene/content/images/NOTE
index fcd87f9132..fcd87f9132 100644
--- a/examples/declarative/toys/dynamicscene/content/images/NOTE
+++ b/examples/demos/dynamicscene/content/images/NOTE
diff --git a/examples/declarative/animation/basics/images/face-smile.png b/examples/demos/dynamicscene/content/images/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/animation/basics/images/face-smile.png
+++ b/examples/demos/dynamicscene/content/images/face-smile.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/moon.png b/examples/demos/dynamicscene/content/images/moon.png
index 1c0d6066a8..1c0d6066a8 100644
--- a/examples/declarative/toys/dynamicscene/content/images/moon.png
+++ b/examples/demos/dynamicscene/content/images/moon.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/rabbit_brown.png b/examples/demos/dynamicscene/content/images/rabbit_brown.png
index ebfdeed332..ebfdeed332 100644
--- a/examples/declarative/toys/dynamicscene/content/images/rabbit_brown.png
+++ b/examples/demos/dynamicscene/content/images/rabbit_brown.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/rabbit_bw.png b/examples/demos/dynamicscene/content/images/rabbit_bw.png
index 7bff9b92ca..7bff9b92ca 100644
--- a/examples/declarative/toys/dynamicscene/content/images/rabbit_bw.png
+++ b/examples/demos/dynamicscene/content/images/rabbit_bw.png
diff --git a/examples/declarative/animation/basics/images/star.png b/examples/demos/dynamicscene/content/images/star.png
index 27ef924267..27ef924267 100644
--- a/examples/declarative/animation/basics/images/star.png
+++ b/examples/demos/dynamicscene/content/images/star.png
diff --git a/examples/declarative/animation/basics/images/sun.png b/examples/demos/dynamicscene/content/images/sun.png
index 7713ca5ce7..7713ca5ce7 100644
--- a/examples/declarative/animation/basics/images/sun.png
+++ b/examples/demos/dynamicscene/content/images/sun.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/tree_s.png b/examples/demos/dynamicscene/content/images/tree_s.png
index 6eac35a729..6eac35a729 100644
--- a/examples/declarative/toys/dynamicscene/content/images/tree_s.png
+++ b/examples/demos/dynamicscene/content/images/tree_s.png
diff --git a/examples/declarative/toys/dynamicscene/content/itemCreation.js b/examples/demos/dynamicscene/content/itemCreation.js
index 40f5415f9f..40f5415f9f 100644
--- a/examples/declarative/toys/dynamicscene/content/itemCreation.js
+++ b/examples/demos/dynamicscene/content/itemCreation.js
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/demos/dynamicscene/dynamicscene.qml
index e64eb0fd0f..c64df5cfc0 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/demos/dynamicscene/dynamicscene.qml
@@ -48,7 +48,7 @@ Item {
     property int activeSuns: 0
     property int centerOffset: 72
 
-    height: 480; width: 360
+    height: 480; width: 320
 
 
     MouseArea {
diff --git a/examples/declarative/flickr/content/Button.qml b/examples/demos/flickr/content/Button.qml
index d6a8d3e001..d6a8d3e001 100644
--- a/examples/declarative/flickr/content/Button.qml
+++ b/examples/demos/flickr/content/Button.qml
diff --git a/examples/declarative/flickr/content/GridDelegate.qml b/examples/demos/flickr/content/GridDelegate.qml
index 794d768c74..794d768c74 100644
--- a/examples/declarative/flickr/content/GridDelegate.qml
+++ b/examples/demos/flickr/content/GridDelegate.qml
diff --git a/examples/declarative/flickr/content/ImageDetails.qml b/examples/demos/flickr/content/ImageDetails.qml
index 83f2537d65..83f2537d65 100644
--- a/examples/declarative/flickr/content/ImageDetails.qml
+++ b/examples/demos/flickr/content/ImageDetails.qml
diff --git a/examples/declarative/flickr/content/ListDelegate.qml b/examples/demos/flickr/content/ListDelegate.qml
index 9c239151f1..9c239151f1 100644
--- a/examples/declarative/flickr/content/ListDelegate.qml
+++ b/examples/demos/flickr/content/ListDelegate.qml
diff --git a/examples/declarative/flickr/content/Progress.qml b/examples/demos/flickr/content/Progress.qml
index 81f1e79ed6..81f1e79ed6 100644
--- a/examples/declarative/flickr/content/Progress.qml
+++ b/examples/demos/flickr/content/Progress.qml
diff --git a/examples/declarative/flickr/content/RssModel.qml b/examples/demos/flickr/content/RssModel.qml
index f28a23d502..f28a23d502 100644
--- a/examples/declarative/flickr/content/RssModel.qml
+++ b/examples/demos/flickr/content/RssModel.qml
diff --git a/examples/declarative/flickr/content/ScrollBar.qml b/examples/demos/flickr/content/ScrollBar.qml
index 388e43dc2d..388e43dc2d 100644
--- a/examples/declarative/flickr/content/ScrollBar.qml
+++ b/examples/demos/flickr/content/ScrollBar.qml
diff --git a/examples/declarative/flickr/content/Slider.qml b/examples/demos/flickr/content/Slider.qml
index 0f9e8b20f2..0f9e8b20f2 100644
--- a/examples/declarative/flickr/content/Slider.qml
+++ b/examples/demos/flickr/content/Slider.qml
diff --git a/examples/declarative/flickr/content/TitleBar.qml b/examples/demos/flickr/content/TitleBar.qml
index 3dab005a11..3dab005a11 100644
--- a/examples/declarative/flickr/content/TitleBar.qml
+++ b/examples/demos/flickr/content/TitleBar.qml
diff --git a/examples/declarative/flickr/content/ToolBar.qml b/examples/demos/flickr/content/ToolBar.qml
index e82be63e7e..e82be63e7e 100644
--- a/examples/declarative/flickr/content/ToolBar.qml
+++ b/examples/demos/flickr/content/ToolBar.qml
diff --git a/examples/declarative/flickr/content/UnifiedDelegate.qml b/examples/demos/flickr/content/UnifiedDelegate.qml
index 00a777b0a1..00a777b0a1 100644
--- a/examples/declarative/flickr/content/UnifiedDelegate.qml
+++ b/examples/demos/flickr/content/UnifiedDelegate.qml
diff --git a/examples/declarative/canvas/contents/images/gloss.png b/examples/demos/flickr/content/images/gloss.png
index 5d370cd93d..5d370cd93d 100755..100644
--- a/examples/declarative/canvas/contents/images/gloss.png
+++ b/examples/demos/flickr/content/images/gloss.png
diff --git a/examples/declarative/canvas/contents/images/lineedit.png b/examples/demos/flickr/content/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100755..100644
--- a/examples/declarative/canvas/contents/images/lineedit.png
+++ b/examples/demos/flickr/content/images/lineedit.png
diff --git a/examples/declarative/canvas/contents/images/lineedit.sci b/examples/demos/flickr/content/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/canvas/contents/images/lineedit.sci
+++ b/examples/demos/flickr/content/images/lineedit.sci
diff --git a/examples/declarative/flickr/content/images/noise.png b/examples/demos/flickr/content/images/noise.png
index c5a5ba0053..c5a5ba0053 100644
--- a/examples/declarative/flickr/content/images/noise.png
+++ b/examples/demos/flickr/content/images/noise.png
diff --git a/examples/declarative/flickr/content/images/particle.png b/examples/demos/flickr/content/images/particle.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/flickr/content/images/particle.png
+++ b/examples/demos/flickr/content/images/particle.png
diff --git a/examples/declarative/canvas/contents/images/quit.png b/examples/demos/flickr/content/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100755..100644
--- a/examples/declarative/canvas/contents/images/quit.png
+++ b/examples/demos/flickr/content/images/quit.png
diff --git a/examples/declarative/flickr/content/images/squareParticle.png b/examples/demos/flickr/content/images/squareParticle.png
index faf85c24e0..faf85c24e0 100644
--- a/examples/declarative/flickr/content/images/squareParticle.png
+++ b/examples/demos/flickr/content/images/squareParticle.png
diff --git a/examples/declarative/canvas/contents/images/stripes.png b/examples/demos/flickr/content/images/stripes.png
index 9f36727ea4..9f36727ea4 100755..100644
--- a/examples/declarative/canvas/contents/images/stripes.png
+++ b/examples/demos/flickr/content/images/stripes.png
diff --git a/examples/declarative/canvas/contents/images/titlebar.png b/examples/demos/flickr/content/images/titlebar.png
index 51c90082d0..51c90082d0 100755..100644
--- a/examples/declarative/canvas/contents/images/titlebar.png
+++ b/examples/demos/flickr/content/images/titlebar.png
diff --git a/examples/declarative/canvas/contents/images/titlebar.sci b/examples/demos/flickr/content/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/canvas/contents/images/titlebar.sci
+++ b/examples/demos/flickr/content/images/titlebar.sci
diff --git a/examples/declarative/canvas/contents/images/toolbutton.png b/examples/demos/flickr/content/images/toolbutton.png
index 11310013ee..11310013ee 100755..100644
--- a/examples/declarative/canvas/contents/images/toolbutton.png
+++ b/examples/demos/flickr/content/images/toolbutton.png
diff --git a/examples/declarative/canvas/contents/images/toolbutton.sci b/examples/demos/flickr/content/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/canvas/contents/images/toolbutton.sci
+++ b/examples/demos/flickr/content/images/toolbutton.sci
diff --git a/examples/declarative/flickr/content/qmldir b/examples/demos/flickr/content/qmldir
index adc2479b9f..adc2479b9f 100644
--- a/examples/declarative/flickr/content/qmldir
+++ b/examples/demos/flickr/content/qmldir
diff --git a/examples/declarative/flickr/flickr-90.qml b/examples/demos/flickr/flickr-90.qml
index ae06957649..ae06957649 100644
--- a/examples/declarative/flickr/flickr-90.qml
+++ b/examples/demos/flickr/flickr-90.qml
diff --git a/examples/declarative/flickr/flickr.qml b/examples/demos/flickr/flickr.qml
index 74c41f185b..74c41f185b 100644
--- a/examples/declarative/flickr/flickr.qml
+++ b/examples/demos/flickr/flickr.qml
diff --git a/examples/declarative/flickr/flickr.qmlproject b/examples/demos/flickr/flickr.qmlproject
index af5179d84b..af5179d84b 100644
--- a/examples/declarative/flickr/flickr.qmlproject
+++ b/examples/demos/flickr/flickr.qmlproject
diff --git a/examples/declarative/minehunt/MinehuntCore/Explosion.qml b/examples/demos/minehunt/MinehuntCore/Explosion.qml
index 0983b68db4..0983b68db4 100644
--- a/examples/declarative/minehunt/MinehuntCore/Explosion.qml
+++ b/examples/demos/minehunt/MinehuntCore/Explosion.qml
diff --git a/examples/declarative/minehunt/MinehuntCore/Tile.qml b/examples/demos/minehunt/MinehuntCore/Tile.qml
index 14c1f51f9e..14c1f51f9e 100644
--- a/examples/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/examples/demos/minehunt/MinehuntCore/Tile.qml
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/back.png b/examples/demos/minehunt/MinehuntCore/pics/back.png
index f6b3f0b4d7..f6b3f0b4d7 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/back.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/back.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/background.png b/examples/demos/minehunt/MinehuntCore/pics/background.png
index 3734a27744..3734a27744 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/background.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/background.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png b/examples/demos/minehunt/MinehuntCore/pics/bomb-color.png
index 61ad0a928f..61ad0a928f 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/bomb-color.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/bomb-color.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/bomb.png b/examples/demos/minehunt/MinehuntCore/pics/bomb.png
index a992575518..a992575518 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/bomb.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/bomb.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png b/examples/demos/minehunt/MinehuntCore/pics/face-sad.png
index cf00aafe1f..cf00aafe1f 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-sad.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/face-sad.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/demos/minehunt/MinehuntCore/pics/face-smile-big.png
index f9c2335df5..f9c2335df5 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/face-smile-big.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png b/examples/demos/minehunt/MinehuntCore/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/face-smile.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/face-smile.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png b/examples/demos/minehunt/MinehuntCore/pics/flag-color.png
index aadad0f11a..aadad0f11a 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/flag-color.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/flag-color.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/flag.png b/examples/demos/minehunt/MinehuntCore/pics/flag.png
index 39cde4df82..39cde4df82 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/flag.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/flag.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/front.png b/examples/demos/minehunt/MinehuntCore/pics/front.png
index 834331bd49..834331bd49 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/front.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/front.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/quit.png b/examples/demos/minehunt/MinehuntCore/pics/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/quit.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/quit.png
diff --git a/examples/declarative/minehunt/MinehuntCore/pics/star.png b/examples/demos/minehunt/MinehuntCore/pics/star.png
index 3772359188..3772359188 100644
--- a/examples/declarative/minehunt/MinehuntCore/pics/star.png
+++ b/examples/demos/minehunt/MinehuntCore/pics/star.png
diff --git a/examples/declarative/minehunt/MinehuntCore/qmldir b/examples/demos/minehunt/MinehuntCore/qmldir
index a0213a19c4..a0213a19c4 100644
--- a/examples/declarative/minehunt/MinehuntCore/qmldir
+++ b/examples/demos/minehunt/MinehuntCore/qmldir
diff --git a/examples/declarative/minehunt/README b/examples/demos/minehunt/README
index 3849ca5fbf..3849ca5fbf 100644
--- a/examples/declarative/minehunt/README
+++ b/examples/demos/minehunt/README
diff --git a/examples/declarative/minehunt/main.cpp b/examples/demos/minehunt/main.cpp
index 47c0436969..47c0436969 100644
--- a/examples/declarative/minehunt/main.cpp
+++ b/examples/demos/minehunt/main.cpp
diff --git a/examples/declarative/minehunt/minehunt.cpp b/examples/demos/minehunt/minehunt.cpp
index facbec375a..facbec375a 100644
--- a/examples/declarative/minehunt/minehunt.cpp
+++ b/examples/demos/minehunt/minehunt.cpp
diff --git a/examples/declarative/minehunt/minehunt.h b/examples/demos/minehunt/minehunt.h
index a0ae23fa8a..a0ae23fa8a 100644
--- a/examples/declarative/minehunt/minehunt.h
+++ b/examples/demos/minehunt/minehunt.h
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro
index 81b6b80486..81b6b80486 100644
--- a/examples/declarative/minehunt/minehunt.pro
+++ b/examples/demos/minehunt/minehunt.pro
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/demos/minehunt/minehunt.qml
index 7c4948a3bb..7c4948a3bb 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/demos/minehunt/minehunt.qml
diff --git a/examples/declarative/minehunt/minehunt.qmlproject b/examples/demos/minehunt/minehunt.qmlproject
index 5aeb78f1ea..5aeb78f1ea 100644
--- a/examples/declarative/minehunt/minehunt.qmlproject
+++ b/examples/demos/minehunt/minehunt.qmlproject
diff --git a/examples/declarative/minehunt/minehunt.qrc b/examples/demos/minehunt/minehunt.qrc
index fa8e27d383..fa8e27d383 100644
--- a/examples/declarative/minehunt/minehunt.qrc
+++ b/examples/demos/minehunt/minehunt.qrc
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index f183c4b2a0..f183c4b2a0 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 2b1a75f369..2b1a75f369 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/Button.qml b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
index fcce969fbd..fcce969fbd 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
index 5d845938c7..5d845938c7 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index b972c938eb..b972c938eb 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
index 43c936e342..43c936e342 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
index ab818924ac..ab818924ac 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
index 2b546a3ac6..2b546a3ac6 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
index 431af8545d..431af8545d 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
+++ b/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png b/examples/demos/photoviewer/PhotoViewerCore/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/busy.png
+++ b/examples/demos/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png
index 1847ab528d..1847ab528d 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
+++ b/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/qmldir b/examples/demos/photoviewer/PhotoViewerCore/qmldir
index d3c247f21a..d3c247f21a 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/qmldir
+++ b/examples/demos/photoviewer/PhotoViewerCore/qmldir
diff --git a/examples/declarative/particles/itemparticle/content/script.js b/examples/demos/photoviewer/PhotoViewerCore/script/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/declarative/particles/itemparticle/content/script.js
+++ b/examples/demos/photoviewer/PhotoViewerCore/script/script.js
diff --git a/examples/declarative/photoviewer/i18n/base.ts b/examples/demos/photoviewer/i18n/base.ts
index 1accfd2f90..1accfd2f90 100644
--- a/examples/declarative/photoviewer/i18n/base.ts
+++ b/examples/demos/photoviewer/i18n/base.ts
diff --git a/examples/declarative/photoviewer/i18n/qml_fr.qm b/examples/demos/photoviewer/i18n/qml_fr.qm
index c24fcbc46c..c24fcbc46c 100644
--- a/examples/declarative/photoviewer/i18n/qml_fr.qm
+++ b/examples/demos/photoviewer/i18n/qml_fr.qm
diff --git a/examples/declarative/photoviewer/i18n/qml_fr.ts b/examples/demos/photoviewer/i18n/qml_fr.ts
index 9f892db616..9f892db616 100644
--- a/examples/declarative/photoviewer/i18n/qml_fr.ts
+++ b/examples/demos/photoviewer/i18n/qml_fr.ts
diff --git a/examples/declarative/photoviewer/photoviewer.qml b/examples/demos/photoviewer/photoviewer.qml
index 918438832b..918438832b 100644
--- a/examples/declarative/photoviewer/photoviewer.qml
+++ b/examples/demos/photoviewer/photoviewer.qml
diff --git a/examples/declarative/photoviewer/photoviewer.qmlproject b/examples/demos/photoviewer/photoviewer.qmlproject
index 600bdb10f4..600bdb10f4 100644
--- a/examples/declarative/photoviewer/photoviewer.qmlproject
+++ b/examples/demos/photoviewer/photoviewer.qmlproject
diff --git a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject b/examples/demos/plasmapatrol/PlasmaPatrol.qmlproject
index 548295243d..548295243d 100644
--- a/examples/declarative/particles/plasmapatrol/PlasmaPatrol.qmlproject
+++ b/examples/demos/plasmapatrol/PlasmaPatrol.qmlproject
diff --git a/examples/declarative/particles/plasmapatrol/TODO b/examples/demos/plasmapatrol/TODO
index ef9d21a73d..ef9d21a73d 100644
--- a/examples/declarative/particles/plasmapatrol/TODO
+++ b/examples/demos/plasmapatrol/TODO
diff --git a/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml b/examples/demos/plasmapatrol/content/BlasterHardpoint.qml
index 4ac30d0202..4ac30d0202 100644
--- a/examples/declarative/particles/plasmapatrol/content/BlasterHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/BlasterHardpoint.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Button.qml b/examples/demos/plasmapatrol/content/Button.qml
index 405b99304f..405b99304f 100644
--- a/examples/declarative/particles/plasmapatrol/content/Button.qml
+++ b/examples/demos/plasmapatrol/content/Button.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml b/examples/demos/plasmapatrol/content/CannonHardpoint.qml
index c4aa412760..c4aa412760 100644
--- a/examples/declarative/particles/plasmapatrol/content/CannonHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/CannonHardpoint.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml b/examples/demos/plasmapatrol/content/ChoiceBox.qml
index a678bc9dd4..a678bc9dd4 100644
--- a/examples/declarative/particles/plasmapatrol/content/ChoiceBox.qml
+++ b/examples/demos/plasmapatrol/content/ChoiceBox.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Cruiser.qml b/examples/demos/plasmapatrol/content/Cruiser.qml
index c689879dce..c689879dce 100644
--- a/examples/declarative/particles/plasmapatrol/content/Cruiser.qml
+++ b/examples/demos/plasmapatrol/content/Cruiser.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Frigate.qml b/examples/demos/plasmapatrol/content/Frigate.qml
index de099bed72..de099bed72 100644
--- a/examples/declarative/particles/plasmapatrol/content/Frigate.qml
+++ b/examples/demos/plasmapatrol/content/Frigate.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml b/examples/demos/plasmapatrol/content/Hardpoint.qml
index 5c7fb5521b..5c7fb5521b 100644
--- a/examples/declarative/particles/plasmapatrol/content/Hardpoint.qml
+++ b/examples/demos/plasmapatrol/content/Hardpoint.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml b/examples/demos/plasmapatrol/content/HelpScreens.qml
index 9297f86f31..9297f86f31 100644
--- a/examples/declarative/particles/plasmapatrol/content/HelpScreens.qml
+++ b/examples/demos/plasmapatrol/content/HelpScreens.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml b/examples/demos/plasmapatrol/content/LaserHardpoint.qml
index 87ac3e9e62..87ac3e9e62 100644
--- a/examples/declarative/particles/plasmapatrol/content/LaserHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/LaserHardpoint.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml
index 95d4bcd2b9..95d4bcd2b9 100644
--- a/examples/declarative/particles/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml b/examples/demos/plasmapatrol/content/SequentialLoader.qml
index eaef87fe57..eaef87fe57 100644
--- a/examples/declarative/particles/plasmapatrol/content/SequentialLoader.qml
+++ b/examples/demos/plasmapatrol/content/SequentialLoader.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Ship.qml b/examples/demos/plasmapatrol/content/Ship.qml
index a928cd2a2e..a928cd2a2e 100644
--- a/examples/declarative/particles/plasmapatrol/content/Ship.qml
+++ b/examples/demos/plasmapatrol/content/Ship.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/Sloop.qml b/examples/demos/plasmapatrol/content/Sloop.qml
index c6b1183162..c6b1183162 100644
--- a/examples/declarative/particles/plasmapatrol/content/Sloop.qml
+++ b/examples/demos/plasmapatrol/content/Sloop.qml
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png b/examples/demos/plasmapatrol/content/pics/TitleText.png
index dc3acebe39..dc3acebe39 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/TitleText.png
+++ b/examples/demos/plasmapatrol/content/pics/TitleText.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png b/examples/demos/plasmapatrol/content/pics/blur-circle2.png
index f7c9f3e98e..f7c9f3e98e 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle2.png
+++ b/examples/demos/plasmapatrol/content/pics/blur-circle2.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png b/examples/demos/plasmapatrol/content/pics/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/blur-circle3.png
+++ b/examples/demos/plasmapatrol/content/pics/blur-circle3.png
diff --git a/examples/declarative/particles/images/finalfrontier.png b/examples/demos/plasmapatrol/content/pics/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/particles/images/finalfrontier.png
+++ b/examples/demos/plasmapatrol/content/pics/finalfrontier.png
diff --git a/examples/declarative/particles/images/meteor.png b/examples/demos/plasmapatrol/content/pics/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/particles/images/meteor.png
+++ b/examples/demos/plasmapatrol/content/pics/meteor.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png b/examples/demos/plasmapatrol/content/pics/meteor_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/meteor_explo.png
+++ b/examples/demos/plasmapatrol/content/pics/meteor_explo.png
diff --git a/examples/declarative/particles/images/nullRock.png b/examples/demos/plasmapatrol/content/pics/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/particles/images/nullRock.png
+++ b/examples/demos/plasmapatrol/content/pics/nullRock.png
diff --git a/examples/declarative/particles/images/particle.png b/examples/demos/plasmapatrol/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/images/particle.png
+++ b/examples/demos/plasmapatrol/content/pics/particle.png
diff --git a/examples/declarative/particles/images/star.png b/examples/demos/plasmapatrol/content/pics/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/images/star.png
+++ b/examples/demos/plasmapatrol/content/pics/star.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star2.png b/examples/demos/plasmapatrol/content/pics/star2.png
index bb55c44788..bb55c44788 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star2.png
+++ b/examples/demos/plasmapatrol/content/pics/star2.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star3.png b/examples/demos/plasmapatrol/content/pics/star3.png
index 636a25f480..636a25f480 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star3.png
+++ b/examples/demos/plasmapatrol/content/pics/star3.png
diff --git a/examples/declarative/particles/plasmapatrol/plasmapatrol.qml b/examples/demos/plasmapatrol/plasmapatrol.qml
index 45f81c7222..45f81c7222 100644
--- a/examples/declarative/particles/plasmapatrol/plasmapatrol.qml
+++ b/examples/demos/plasmapatrol/plasmapatrol.qml
diff --git a/examples/declarative/rssnews/content/BusyIndicator.qml b/examples/demos/rssnews/content/BusyIndicator.qml
index b6264ead92..b6264ead92 100644
--- a/examples/declarative/rssnews/content/BusyIndicator.qml
+++ b/examples/demos/rssnews/content/BusyIndicator.qml
diff --git a/examples/declarative/rssnews/content/CategoryDelegate.qml b/examples/demos/rssnews/content/CategoryDelegate.qml
index 1a56184489..1a56184489 100644
--- a/examples/declarative/rssnews/content/CategoryDelegate.qml
+++ b/examples/demos/rssnews/content/CategoryDelegate.qml
diff --git a/examples/declarative/rssnews/content/NewsDelegate.qml b/examples/demos/rssnews/content/NewsDelegate.qml
index 84019a9179..84019a9179 100644
--- a/examples/declarative/rssnews/content/NewsDelegate.qml
+++ b/examples/demos/rssnews/content/NewsDelegate.qml
diff --git a/examples/declarative/rssnews/content/RssFeeds.qml b/examples/demos/rssnews/content/RssFeeds.qml
index 278f05752c..278f05752c 100644
--- a/examples/declarative/rssnews/content/RssFeeds.qml
+++ b/examples/demos/rssnews/content/RssFeeds.qml
diff --git a/examples/declarative/rssnews/content/ScrollBar.qml b/examples/demos/rssnews/content/ScrollBar.qml
index 4ca4132c6b..4ca4132c6b 100644
--- a/examples/declarative/rssnews/content/ScrollBar.qml
+++ b/examples/demos/rssnews/content/ScrollBar.qml
diff --git a/examples/declarative/rssnews/content/images/busy.png b/examples/demos/rssnews/content/images/busy.png
index 664c2b1491..664c2b1491 100644
--- a/examples/declarative/rssnews/content/images/busy.png
+++ b/examples/demos/rssnews/content/images/busy.png
diff --git a/examples/declarative/rssnews/content/images/scrollbar.png b/examples/demos/rssnews/content/images/scrollbar.png
index 0228dcf9eb..0228dcf9eb 100644
--- a/examples/declarative/rssnews/content/images/scrollbar.png
+++ b/examples/demos/rssnews/content/images/scrollbar.png
diff --git a/examples/declarative/rssnews/rssnews.qml b/examples/demos/rssnews/rssnews.qml
index 491cefda07..491cefda07 100644
--- a/examples/declarative/rssnews/rssnews.qml
+++ b/examples/demos/rssnews/rssnews.qml
diff --git a/examples/declarative/rssnews/rssnews.qmlproject b/examples/demos/rssnews/rssnews.qmlproject
index 5becbdaed0..5becbdaed0 100644
--- a/examples/declarative/rssnews/rssnews.qmlproject
+++ b/examples/demos/rssnews/rssnews.qmlproject
diff --git a/examples/declarative/samegame/content/BoomBlock.qml b/examples/demos/samegame/content/BoomBlock.qml
index 47f86bd81b..47f86bd81b 100644
--- a/examples/declarative/samegame/content/BoomBlock.qml
+++ b/examples/demos/samegame/content/BoomBlock.qml
diff --git a/examples/declarative/samegame/content/Button.qml b/examples/demos/samegame/content/Button.qml
index b305455c92..b305455c92 100644
--- a/examples/declarative/samegame/content/Button.qml
+++ b/examples/demos/samegame/content/Button.qml
diff --git a/examples/declarative/samegame/content/Dialog.qml b/examples/demos/samegame/content/Dialog.qml
index 80e5984bfe..80e5984bfe 100644
--- a/examples/declarative/samegame/content/Dialog.qml
+++ b/examples/demos/samegame/content/Dialog.qml
diff --git a/examples/declarative/samegame/content/GameArea.qml b/examples/demos/samegame/content/GameArea.qml
index a43d55117a..a43d55117a 100644
--- a/examples/declarative/samegame/content/GameArea.qml
+++ b/examples/demos/samegame/content/GameArea.qml
diff --git a/examples/declarative/samegame/content/NameInputDialog.qml b/examples/demos/samegame/content/NameInputDialog.qml
index 602e69789a..602e69789a 100644
--- a/examples/declarative/samegame/content/NameInputDialog.qml
+++ b/examples/demos/samegame/content/NameInputDialog.qml
diff --git a/examples/declarative/samegame/content/pics/background.png b/examples/demos/samegame/content/pics/background.png
index 3734a27744..3734a27744 100644
--- a/examples/declarative/samegame/content/pics/background.png
+++ b/examples/demos/samegame/content/pics/background.png
diff --git a/examples/declarative/samegame/content/pics/blueStone.png b/examples/demos/samegame/content/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/declarative/samegame/content/pics/blueStone.png
+++ b/examples/demos/samegame/content/pics/blueStone.png
diff --git a/examples/declarative/samegame/content/pics/greenStone.png b/examples/demos/samegame/content/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/declarative/samegame/content/pics/greenStone.png
+++ b/examples/demos/samegame/content/pics/greenStone.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/particle.png b/examples/demos/samegame/content/pics/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/particle.png
+++ b/examples/demos/samegame/content/pics/particle.png
diff --git a/examples/declarative/samegame/content/pics/redStone.png b/examples/demos/samegame/content/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/declarative/samegame/content/pics/redStone.png
+++ b/examples/demos/samegame/content/pics/redStone.png
diff --git a/examples/declarative/samegame/content/pics/yellowStone.png b/examples/demos/samegame/content/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/declarative/samegame/content/pics/yellowStone.png
+++ b/examples/demos/samegame/content/pics/yellowStone.png
diff --git a/examples/declarative/samegame/content/samegame.js b/examples/demos/samegame/content/samegame.js
index 611767584b..611767584b 100755
--- a/examples/declarative/samegame/content/samegame.js
+++ b/examples/demos/samegame/content/samegame.js
diff --git a/examples/declarative/samegame/samegame.qml b/examples/demos/samegame/samegame.qml
index 201f826a29..201f826a29 100644
--- a/examples/declarative/samegame/samegame.qml
+++ b/examples/demos/samegame/samegame.qml
diff --git a/examples/declarative/samegame/samegame.qmlproject b/examples/demos/samegame/samegame.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/samegame/samegame.qmlproject
+++ b/examples/demos/samegame/samegame.qmlproject
diff --git a/examples/declarative/snake/content/Button.qml b/examples/demos/snake/content/Button.qml
index dfac45049a..dfac45049a 100644
--- a/examples/declarative/snake/content/Button.qml
+++ b/examples/demos/snake/content/Button.qml
diff --git a/examples/declarative/snake/content/Cookie.qml b/examples/demos/snake/content/Cookie.qml
index cae53af525..cae53af525 100644
--- a/examples/declarative/snake/content/Cookie.qml
+++ b/examples/demos/snake/content/Cookie.qml
diff --git a/examples/declarative/snake/content/HighScoreModel.qml b/examples/demos/snake/content/HighScoreModel.qml
index af66b99ede..af66b99ede 100644
--- a/examples/declarative/snake/content/HighScoreModel.qml
+++ b/examples/demos/snake/content/HighScoreModel.qml
diff --git a/examples/declarative/snake/content/Link.qml b/examples/demos/snake/content/Link.qml
index 891adafe5e..891adafe5e 100644
--- a/examples/declarative/snake/content/Link.qml
+++ b/examples/demos/snake/content/Link.qml
diff --git a/examples/declarative/snake/content/Skull.qml b/examples/demos/snake/content/Skull.qml
index ce3d108e04..9026790a5d 100644
--- a/examples/declarative/snake/content/Skull.qml
+++ b/examples/demos/snake/content/Skull.qml
@@ -48,10 +48,10 @@ Image {
     property int verticalMovement;
     property int horizontalMovement;
 
-    x: margin + column * gridSize + 2
-    y: margin + row * gridSize - 3
-    Behavior on x { NumberAnimation { duration: spawned ? halfbeatInterval : 0} }
-    Behavior on y { NumberAnimation { duration: spawned ? halfbeatInterval : 0 } }
+    x: screen.margin + column * screen.gridSize + 2
+    y: screen.margin + row * screen.gridSize - 3
+    Behavior on x { NumberAnimation { duration: spawned ? screen.halfbeatInterval : 0} }
+    Behavior on y { NumberAnimation { duration: spawned ? screen.halfbeatInterval : 0 } }
 
     opacity: spawned ? 1 : 0
     Behavior on opacity { NumberAnimation { duration: 200 } }
diff --git a/examples/declarative/snake/content/pics/README b/examples/demos/snake/content/pics/README
index 0215132caa..0215132caa 100644
--- a/examples/declarative/snake/content/pics/README
+++ b/examples/demos/snake/content/pics/README
diff --git a/examples/declarative/snake/content/pics/background.png b/examples/demos/snake/content/pics/background.png
index 72dffaa843..72dffaa843 100644
--- a/examples/declarative/snake/content/pics/background.png
+++ b/examples/demos/snake/content/pics/background.png
diff --git a/examples/declarative/snake/content/pics/blueStar.png b/examples/demos/snake/content/pics/blueStar.png
index ba7acabd26..ba7acabd26 100644
--- a/examples/declarative/snake/content/pics/blueStar.png
+++ b/examples/demos/snake/content/pics/blueStar.png
diff --git a/examples/declarative/snake/content/pics/blueStone.png b/examples/demos/snake/content/pics/blueStone.png
index 356affdd95..356affdd95 100644
--- a/examples/declarative/snake/content/pics/blueStone.png
+++ b/examples/demos/snake/content/pics/blueStone.png
diff --git a/examples/declarative/snake/content/pics/cookie.png b/examples/demos/snake/content/pics/cookie.png
index aec2957f34..aec2957f34 100644
--- a/examples/declarative/snake/content/pics/cookie.png
+++ b/examples/demos/snake/content/pics/cookie.png
diff --git a/examples/declarative/snake/content/pics/eyes.svg b/examples/demos/snake/content/pics/eyes.svg
index 1078692725..1078692725 100644
--- a/examples/declarative/snake/content/pics/eyes.svg
+++ b/examples/demos/snake/content/pics/eyes.svg
diff --git a/examples/declarative/snake/content/pics/head.png b/examples/demos/snake/content/pics/head.png
index 550e002687..550e002687 100644
--- a/examples/declarative/snake/content/pics/head.png
+++ b/examples/demos/snake/content/pics/head.png
diff --git a/examples/declarative/snake/content/pics/pause.png b/examples/demos/snake/content/pics/pause.png
index 056d97dd17..056d97dd17 100644
--- a/examples/declarative/snake/content/pics/pause.png
+++ b/examples/demos/snake/content/pics/pause.png
diff --git a/examples/declarative/snake/content/pics/redStar.png b/examples/demos/snake/content/pics/redStar.png
index cd06854719..cd06854719 100644
--- a/examples/declarative/snake/content/pics/redStar.png
+++ b/examples/demos/snake/content/pics/redStar.png
diff --git a/examples/declarative/snake/content/pics/redStone.png b/examples/demos/snake/content/pics/redStone.png
index 9bb7fe4277..9bb7fe4277 100644
--- a/examples/declarative/snake/content/pics/redStone.png
+++ b/examples/demos/snake/content/pics/redStone.png
diff --git a/examples/declarative/snake/content/pics/skull.png b/examples/demos/snake/content/pics/skull.png
index 63186167bd..63186167bd 100644
--- a/examples/declarative/snake/content/pics/skull.png
+++ b/examples/demos/snake/content/pics/skull.png
diff --git a/examples/declarative/snake/content/pics/snake.jpg b/examples/demos/snake/content/pics/snake.jpg
index e91a784f71..e91a784f71 100644
--- a/examples/declarative/snake/content/pics/snake.jpg
+++ b/examples/demos/snake/content/pics/snake.jpg
diff --git a/examples/declarative/snake/content/pics/star.png b/examples/demos/snake/content/pics/star.png
index defbde53ca..defbde53ca 100644
--- a/examples/declarative/snake/content/pics/star.png
+++ b/examples/demos/snake/content/pics/star.png
diff --git a/examples/declarative/snake/content/pics/stoneShadow.png b/examples/demos/snake/content/pics/stoneShadow.png
index 1bd56afd04..1bd56afd04 100644
--- a/examples/declarative/snake/content/pics/stoneShadow.png
+++ b/examples/demos/snake/content/pics/stoneShadow.png
diff --git a/examples/declarative/snake/content/pics/yellowStar.png b/examples/demos/snake/content/pics/yellowStar.png
index 52fb9c4b78..52fb9c4b78 100644
--- a/examples/declarative/snake/content/pics/yellowStar.png
+++ b/examples/demos/snake/content/pics/yellowStar.png
diff --git a/examples/declarative/snake/content/pics/yellowStone.png b/examples/demos/snake/content/pics/yellowStone.png
index c56124a895..c56124a895 100644
--- a/examples/declarative/snake/content/pics/yellowStone.png
+++ b/examples/demos/snake/content/pics/yellowStone.png
diff --git a/examples/declarative/snake/content/snake.js b/examples/demos/snake/content/snake.js
index 107c9f4591..107c9f4591 100644
--- a/examples/declarative/snake/content/snake.js
+++ b/examples/demos/snake/content/snake.js
diff --git a/examples/declarative/snake/snake.qml b/examples/demos/snake/snake.qml
index f25b626d02..fca3273def 100644
--- a/examples/declarative/snake/snake.qml
+++ b/examples/demos/snake/snake.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.0
 import "content" as Content
 import "content/snake.js" as Logic
-
+Item{
 Rectangle {
     id: screen;
     SystemPalette { id: activePalette }
@@ -75,14 +75,14 @@ Rectangle {
 
     Timer {
         id: heartbeat;
-        interval: heartbeatInterval;
-        running: activeGame
+        interval: screen.heartbeatInterval;
+        running: screen.activeGame
         repeat: true
         onTriggered: { Logic.move() }
     }
     Timer {
         id: halfbeat;
-        interval: halfbeatInterval;
+        interval: screen.halfbeatInterval;
         repeat: true
         running: heartbeat.running
         onTriggered: { Logic.moveSkull() }
@@ -96,7 +96,7 @@ Rectangle {
     Timer {
         id: startHeartbeatTimer;
         interval: 1000 ;
-        onTriggered: { state = "running"; activeGame = true; }
+        onTriggered: { screen.state = "running"; screen.activeGame = true; }
     }
 
     Image{
@@ -138,7 +138,7 @@ Rectangle {
                     font.pointSize: 24
                     anchors.horizontalCenter: parent.horizontalCenter;
                     //horizontalAlignment: Text.AlignHCenter
-                    text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;
+                    text: "Last Score:\t" + screen.lastScore + "\nHighscore:\t" + highScores.topScore;
                 }
             }
         }
@@ -158,8 +158,8 @@ Rectangle {
             color: "transparent"
             anchors.horizontalCenter: parent.horizontalCenter
             y: (screen.height - 32 - height)/2;
-            width: numColumnsAvailable * gridSize + 2*margin
-            height: numRowsAvailable * gridSize + 2*margin
+            width: screen.numColumnsAvailable * screen.gridSize + 2*screen.margin
+            height: screen.numRowsAvailable * screen.gridSize + 2*screen.margin
 
 
             Content.Skull {
@@ -226,7 +226,7 @@ Rectangle {
 
         Text {
             color: activePalette.text
-            text: "Score: " + score; font.bold: true
+            text: "Score: " + screen.score; font.bold: true
             anchors.right: parent.right; anchors.rightMargin: 3
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -270,3 +270,4 @@ Rectangle {
     ]
 
 }
+}
diff --git a/examples/declarative/snake/snake.qmlproject b/examples/demos/snake/snake.qmlproject
index fb015465d1..fb015465d1 100644
--- a/examples/declarative/snake/snake.qmlproject
+++ b/examples/demos/snake/snake.qmlproject
diff --git a/examples/declarative/toys/tic-tac-toe/content/Button.qml b/examples/demos/tic-tac-toe/content/Button.qml
index 6dd141f838..6dd141f838 100644
--- a/examples/declarative/toys/tic-tac-toe/content/Button.qml
+++ b/examples/demos/tic-tac-toe/content/Button.qml
diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/demos/tic-tac-toe/content/TicTac.qml
index e74bc6bcda..e74bc6bcda 100644
--- a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
+++ b/examples/demos/tic-tac-toe/content/TicTac.qml
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/board.png b/examples/demos/tic-tac-toe/content/pics/board.png
index 7e5b7ba27c..7e5b7ba27c 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/board.png
+++ b/examples/demos/tic-tac-toe/content/pics/board.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/o.png b/examples/demos/tic-tac-toe/content/pics/o.png
index abc7ee020b..abc7ee020b 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/o.png
+++ b/examples/demos/tic-tac-toe/content/pics/o.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/x.png b/examples/demos/tic-tac-toe/content/pics/x.png
index ddc65c83b8..ddc65c83b8 100644
--- a/examples/declarative/toys/tic-tac-toe/content/pics/x.png
+++ b/examples/demos/tic-tac-toe/content/pics/x.png
diff --git a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js b/examples/demos/tic-tac-toe/content/tic-tac-toe.js
index 5a166b750f..5a166b750f 100644
--- a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
+++ b/examples/demos/tic-tac-toe/content/tic-tac-toe.js
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/demos/tic-tac-toe/tic-tac-toe.qml
index 8d15233eaa..8d15233eaa 100644
--- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+++ b/examples/demos/tic-tac-toe/tic-tac-toe.qml
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/demos/tvtennis/tvtennis.qml
index 63866e3ce6..63866e3ce6 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.qml
+++ b/examples/demos/tvtennis/tvtennis.qml
diff --git a/examples/declarative/twitter/TwitterCore/Button.qml b/examples/demos/twitter/TwitterCore/Button.qml
index 064fd4b277..064fd4b277 100644
--- a/examples/declarative/twitter/TwitterCore/Button.qml
+++ b/examples/demos/twitter/TwitterCore/Button.qml
diff --git a/examples/declarative/twitter/TwitterCore/FatDelegate.qml b/examples/demos/twitter/TwitterCore/FatDelegate.qml
index 5fd0d1622b..5fd0d1622b 100644
--- a/examples/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/examples/demos/twitter/TwitterCore/FatDelegate.qml
diff --git a/examples/declarative/twitter/TwitterCore/Input.qml b/examples/demos/twitter/TwitterCore/Input.qml
index 2987b9e5d8..2987b9e5d8 100644
--- a/examples/declarative/twitter/TwitterCore/Input.qml
+++ b/examples/demos/twitter/TwitterCore/Input.qml
diff --git a/examples/declarative/twitter/TwitterCore/Loading.qml b/examples/demos/twitter/TwitterCore/Loading.qml
index 8f7c868bee..8f7c868bee 100644
--- a/examples/declarative/twitter/TwitterCore/Loading.qml
+++ b/examples/demos/twitter/TwitterCore/Loading.qml
diff --git a/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml b/examples/demos/twitter/TwitterCore/MultiTitleBar.qml
index f52ce5be26..f52ce5be26 100644
--- a/examples/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/examples/demos/twitter/TwitterCore/MultiTitleBar.qml
diff --git a/examples/declarative/twitter/TwitterCore/RssModel.qml b/examples/demos/twitter/TwitterCore/RssModel.qml
index c4050994e6..c4050994e6 100644
--- a/examples/declarative/twitter/TwitterCore/RssModel.qml
+++ b/examples/demos/twitter/TwitterCore/RssModel.qml
diff --git a/examples/declarative/twitter/TwitterCore/SearchView.qml b/examples/demos/twitter/TwitterCore/SearchView.qml
index 82a8559889..82a8559889 100644
--- a/examples/declarative/twitter/TwitterCore/SearchView.qml
+++ b/examples/demos/twitter/TwitterCore/SearchView.qml
diff --git a/examples/declarative/twitter/TwitterCore/TitleBar.qml b/examples/demos/twitter/TwitterCore/TitleBar.qml
index 3624048c4d..3624048c4d 100644
--- a/examples/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/examples/demos/twitter/TwitterCore/TitleBar.qml
diff --git a/examples/declarative/twitter/TwitterCore/ToolBar.qml b/examples/demos/twitter/TwitterCore/ToolBar.qml
index 06d3324ee3..06d3324ee3 100644
--- a/examples/declarative/twitter/TwitterCore/ToolBar.qml
+++ b/examples/demos/twitter/TwitterCore/ToolBar.qml
diff --git a/examples/declarative/twitter/TwitterCore/UserModel.qml b/examples/demos/twitter/TwitterCore/UserModel.qml
index f88837c344..f88837c344 100644
--- a/examples/declarative/twitter/TwitterCore/UserModel.qml
+++ b/examples/demos/twitter/TwitterCore/UserModel.qml
diff --git a/examples/declarative/flickr/content/images/gloss.png b/examples/demos/twitter/TwitterCore/images/gloss.png
index 5d370cd93d..5d370cd93d 100644
--- a/examples/declarative/flickr/content/images/gloss.png
+++ b/examples/demos/twitter/TwitterCore/images/gloss.png
diff --git a/examples/declarative/flickr/content/images/lineedit.png b/examples/demos/twitter/TwitterCore/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100644
--- a/examples/declarative/flickr/content/images/lineedit.png
+++ b/examples/demos/twitter/TwitterCore/images/lineedit.png
diff --git a/examples/declarative/flickr/content/images/lineedit.sci b/examples/demos/twitter/TwitterCore/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/flickr/content/images/lineedit.sci
+++ b/examples/demos/twitter/TwitterCore/images/lineedit.sci
diff --git a/examples/declarative/twitter/TwitterCore/images/loading.png b/examples/demos/twitter/TwitterCore/images/loading.png
index 47a1589c5d..47a1589c5d 100644
--- a/examples/declarative/twitter/TwitterCore/images/loading.png
+++ b/examples/demos/twitter/TwitterCore/images/loading.png
diff --git a/examples/declarative/flickr/content/images/quit.png b/examples/demos/twitter/TwitterCore/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100644
--- a/examples/declarative/flickr/content/images/quit.png
+++ b/examples/demos/twitter/TwitterCore/images/quit.png
diff --git a/examples/declarative/flickr/content/images/stripes.png b/examples/demos/twitter/TwitterCore/images/stripes.png
index 9f36727ea4..9f36727ea4 100644
--- a/examples/declarative/flickr/content/images/stripes.png
+++ b/examples/demos/twitter/TwitterCore/images/stripes.png
diff --git a/examples/declarative/flickr/content/images/titlebar.png b/examples/demos/twitter/TwitterCore/images/titlebar.png
index 51c90082d0..51c90082d0 100644
--- a/examples/declarative/flickr/content/images/titlebar.png
+++ b/examples/demos/twitter/TwitterCore/images/titlebar.png
diff --git a/examples/declarative/flickr/content/images/titlebar.sci b/examples/demos/twitter/TwitterCore/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/flickr/content/images/titlebar.sci
+++ b/examples/demos/twitter/TwitterCore/images/titlebar.sci
diff --git a/examples/declarative/flickr/content/images/toolbutton.png b/examples/demos/twitter/TwitterCore/images/toolbutton.png
index 11310013ee..11310013ee 100644
--- a/examples/declarative/flickr/content/images/toolbutton.png
+++ b/examples/demos/twitter/TwitterCore/images/toolbutton.png
diff --git a/examples/declarative/flickr/content/images/toolbutton.sci b/examples/demos/twitter/TwitterCore/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/flickr/content/images/toolbutton.sci
+++ b/examples/demos/twitter/TwitterCore/images/toolbutton.sci
diff --git a/examples/declarative/twitter/TwitterCore/qmldir b/examples/demos/twitter/TwitterCore/qmldir
index 452a648b23..452a648b23 100644
--- a/examples/declarative/twitter/TwitterCore/qmldir
+++ b/examples/demos/twitter/TwitterCore/qmldir
diff --git a/examples/declarative/twitter/twitter.qml b/examples/demos/twitter/twitter.qml
index 26e4a7079b..26e4a7079b 100644
--- a/examples/declarative/twitter/twitter.qml
+++ b/examples/demos/twitter/twitter.qml
diff --git a/examples/declarative/twitter/twitter.qmlproject b/examples/demos/twitter/twitter.qmlproject
index b14f71fdfd..b14f71fdfd 100644
--- a/examples/declarative/twitter/twitter.qmlproject
+++ b/examples/demos/twitter/twitter.qmlproject
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
deleted file mode 100644
index 81334fa552..0000000000
--- a/examples/embedded/embedded.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS +=  qmleasing qmlflickr qmldialcontrol qmlcalculator qmlphotoviewer qmlclocks qmltwitter
diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri
deleted file mode 100644
index a3627b8fa2..0000000000
--- a/examples/embedded/qmlcalculator/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlcalculator_src = $$PWD/../../declarative/calculator
-
-qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core
-DEPLOYMENT += qmlcalculator_files
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp
deleted file mode 100644
index 4be7bc462d..0000000000
--- a/examples/embedded/qmlcalculator/qmlcalculator.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("calculator.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro
deleted file mode 100644
index 25c16ca78a..0000000000
--- a/examples/embedded/qmlcalculator/qmlcalculator.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmlcalculator.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri
deleted file mode 100644
index 771a4dba76..0000000000
--- a/examples/embedded/qmlclocks/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks
-
-qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content
-DEPLOYMENT += qmlclocks_files
diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp
deleted file mode 100644
index ce42ec7b18..0000000000
--- a/examples/embedded/qmlclocks/qmlclocks.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("clocks.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro
deleted file mode 100644
index 8e9dcdf87c..0000000000
--- a/examples/embedded/qmlclocks/qmlclocks.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmlclocks.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri
deleted file mode 100644
index d845120923..0000000000
--- a/examples/embedded/qmldialcontrol/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol
-
-qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content
-DEPLOYMENT += qmldialcontrol_files
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
deleted file mode 100644
index e66f6f6c56..0000000000
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("dialcontrol.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro
deleted file mode 100644
index 08f876b926..0000000000
--- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmldialcontrol.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri
deleted file mode 100644
index 7a5d0401cb..0000000000
--- a/examples/embedded/qmleasing/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmleasing_src = $$PWD/../../../examples/declarative/animation/easing
-
-qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content
-DEPLOYMENT += qmleasing_files
diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp
deleted file mode 100644
index 8220e03cff..0000000000
--- a/examples/embedded/qmleasing/qmleasing.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    const QString mainQmlApp = QLatin1String("easing.qml");
-    QDeclarativeView view;
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-
-#if defined(QT_KEYPAD_NAVIGATION)
-    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
-#endif // QT_KEYPAD_NAVIGATION
-
-    view.show();
-    return application.exec();
-}
diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro
deleted file mode 100644
index c9f008d42e..0000000000
--- a/examples/embedded/qmleasing/qmleasing.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative
-SOURCES += $$PWD/qmleasing.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri
deleted file mode 100644
index 0d76ddc1db..0000000000
--- a/examples/embedded/qmlflickr/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlflickr_src = $$PWD/../../declarative/flickr
-
-qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
-DEPLOYMENT += qmlflickr_files
diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp
deleted file mode 100644
index 93b28f7cec..0000000000
--- a/examples/embedded/qmlflickr/qmlflickr.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtDeclarative/QDeclarativeEngine>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("flickr.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro
deleted file mode 100644
index 869d651b05..0000000000
--- a/examples/embedded/qmlflickr/qmlflickr.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmlflickr.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri
deleted file mode 100644
index 504373914a..0000000000
--- a/examples/embedded/qmlphotoviewer/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmlphotoviewer_src = $$PWD/../../declarative/photoviewer
-
-qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore
-DEPLOYMENT += qmlphotoviewer_files
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
deleted file mode 100644
index 32c9d24eaa..0000000000
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("photoviewer.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
deleted file mode 100644
index 9941b2e226..0000000000
--- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmlphotoviewer.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri
deleted file mode 100644
index a3c045ca54..0000000000
--- a/examples/embedded/qmltwitter/deployment.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-qmltwitter_src = $$PWD/../../declarative/twitter
-
-qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore
-DEPLOYMENT += qmltwitter_files
diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp
deleted file mode 100644
index 19b187bc82..0000000000
--- a/examples/embedded/qmltwitter/qmltwitter.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeNetworkAccessManagerFactory>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkConfigurationManager>
-#include <QtNetwork/QNetworkAccessManager>
-
-// Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise
-// the system default.
-class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    ~NetworkAccessManagerFactory() { }
-
-    QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *accessManager = new QNetworkAccessManager(parent);
-
-    QNetworkConfigurationManager manager;
-    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
-        // Get saved network configuration
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
-        settings.beginGroup(QLatin1String("QtNetwork"));
-        const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
-        settings.endGroup();
-
-        // If the saved network configuration is not currently discovered use the system default
-        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
-        if ((config.state() & QNetworkConfiguration::Discovered) !=
-            QNetworkConfiguration::Discovered) {
-            config = manager.defaultConfiguration();
-        }
-
-        accessManager->setConfiguration(config);
-    }
-
-    return accessManager;
-}
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    NetworkAccessManagerFactory networkAccessManagerFactory;
-
-    const QString mainQmlApp = QLatin1String("twitter.qml");
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory);
-    view.setSource(QUrl(mainQmlApp));
-    view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit()));
-    view.setGeometry(QRect(100, 100, 360, 640));
-    view.show();
-    return application.exec();
-}
-
diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro
deleted file mode 100644
index ce40cd7489..0000000000
--- a/examples/embedded/qmltwitter/qmltwitter.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.")
-
-QT += declarative network
-SOURCES += $$PWD/qmltwitter.cpp
-include($$PWD/deployment.pri)
diff --git a/examples/examples.pro b/examples/examples.pro
index 2c9497dde0..2b78ed7e12 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative tutorials
+SUBDIRS += demos shared localstorage particles qml qtquick tutorials window
 contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/localstorage/hello.qml
index 3496b86bd9..3496b86bd9 100644
--- a/examples/declarative/sqllocalstorage/hello.qml
+++ b/examples/localstorage/hello.qml
diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
new file mode 100644
index 0000000000..967108504e
--- /dev/null
+++ b/examples/localstorage/localstorage.pro
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/declarative/particles/affectors/age.qml b/examples/particles/affectors/age.qml
index 1e7774b63b..1e7774b63b 100644
--- a/examples/declarative/particles/affectors/age.qml
+++ b/examples/particles/affectors/age.qml
diff --git a/examples/declarative/particles/affectors/attractor.qml b/examples/particles/affectors/attractor.qml
index 460a497a92..460a497a92 100644
--- a/examples/declarative/particles/affectors/attractor.qml
+++ b/examples/particles/affectors/attractor.qml
diff --git a/examples/declarative/particles/affectors/customaffector.qml b/examples/particles/affectors/customaffector.qml
index 3f98cd5b43..3f98cd5b43 100644
--- a/examples/declarative/particles/affectors/customaffector.qml
+++ b/examples/particles/affectors/customaffector.qml
diff --git a/examples/declarative/particles/affectors/friction.qml b/examples/particles/affectors/friction.qml
index 4161fd9f02..4161fd9f02 100644
--- a/examples/declarative/particles/affectors/friction.qml
+++ b/examples/particles/affectors/friction.qml
diff --git a/examples/declarative/particles/affectors/gravity.qml b/examples/particles/affectors/gravity.qml
index b90d83e1c8..b90d83e1c8 100644
--- a/examples/declarative/particles/affectors/gravity.qml
+++ b/examples/particles/affectors/gravity.qml
diff --git a/examples/declarative/particles/affectors/groupgoal.qml b/examples/particles/affectors/groupgoal.qml
index 273ec1a30c..273ec1a30c 100644
--- a/examples/declarative/particles/affectors/groupgoal.qml
+++ b/examples/particles/affectors/groupgoal.qml
diff --git a/examples/declarative/particles/affectors/move.qml b/examples/particles/affectors/move.qml
index f290173ca8..f290173ca8 100644
--- a/examples/declarative/particles/affectors/move.qml
+++ b/examples/particles/affectors/move.qml
diff --git a/examples/declarative/particles/affectors/spritegoal.qml b/examples/particles/affectors/spritegoal.qml
index 1ea61442aa..1ea61442aa 100644
--- a/examples/declarative/particles/affectors/spritegoal.qml
+++ b/examples/particles/affectors/spritegoal.qml
diff --git a/examples/declarative/particles/affectors/turbulence.qml b/examples/particles/affectors/turbulence.qml
index f3ad13431f..f3ad13431f 100644
--- a/examples/declarative/particles/affectors/turbulence.qml
+++ b/examples/particles/affectors/turbulence.qml
diff --git a/examples/declarative/particles/affectors/wander.qml b/examples/particles/affectors/wander.qml
index 31a0b4a796..31a0b4a796 100644
--- a/examples/declarative/particles/affectors/wander.qml
+++ b/examples/particles/affectors/wander.qml
diff --git a/examples/declarative/particles/customparticle/blurparticles.qml b/examples/particles/customparticle/blurparticles.qml
index 3d72425655..3d72425655 100644
--- a/examples/declarative/particles/customparticle/blurparticles.qml
+++ b/examples/particles/customparticle/blurparticles.qml
diff --git a/examples/declarative/particles/customparticle/fragmentshader.qml b/examples/particles/customparticle/fragmentshader.qml
index 34acb1bd7c..34acb1bd7c 100644
--- a/examples/declarative/particles/customparticle/fragmentshader.qml
+++ b/examples/particles/customparticle/fragmentshader.qml
diff --git a/examples/declarative/particles/customparticle/imagecolors.qml b/examples/particles/customparticle/imagecolors.qml
index 94e5123a0c..94e5123a0c 100644
--- a/examples/declarative/particles/customparticle/imagecolors.qml
+++ b/examples/particles/customparticle/imagecolors.qml
diff --git a/examples/declarative/particles/emitters/burstandpulse.qml b/examples/particles/emitters/burstandpulse.qml
index 1b1c2a60c9..1b1c2a60c9 100644
--- a/examples/declarative/particles/emitters/burstandpulse.qml
+++ b/examples/particles/emitters/burstandpulse.qml
diff --git a/examples/declarative/particles/emitters/customemitter.qml b/examples/particles/emitters/customemitter.qml
index 757c836106..757c836106 100644
--- a/examples/declarative/particles/emitters/customemitter.qml
+++ b/examples/particles/emitters/customemitter.qml
diff --git a/examples/declarative/particles/emitters/emitmask.qml b/examples/particles/emitters/emitmask.qml
index 9c02f6a213..9c02f6a213 100644
--- a/examples/declarative/particles/emitters/emitmask.qml
+++ b/examples/particles/emitters/emitmask.qml
diff --git a/examples/declarative/particles/emitters/maximumemitted.qml b/examples/particles/emitters/maximumemitted.qml
index 6dbdf8db61..6dbdf8db61 100644
--- a/examples/declarative/particles/emitters/maximumemitted.qml
+++ b/examples/particles/emitters/maximumemitted.qml
diff --git a/examples/declarative/particles/emitters/shapeanddirection.qml b/examples/particles/emitters/shapeanddirection.qml
index 43623427b6..43623427b6 100644
--- a/examples/declarative/particles/emitters/shapeanddirection.qml
+++ b/examples/particles/emitters/shapeanddirection.qml
diff --git a/examples/declarative/particles/emitters/timedgroupchanges.qml b/examples/particles/emitters/timedgroupchanges.qml
index 699e7eb066..699e7eb066 100644
--- a/examples/declarative/particles/emitters/timedgroupchanges.qml
+++ b/examples/particles/emitters/timedgroupchanges.qml
diff --git a/examples/declarative/particles/emitters/trailemitter.qml b/examples/particles/emitters/trailemitter.qml
index e896329ca1..e896329ca1 100644
--- a/examples/declarative/particles/emitters/trailemitter.qml
+++ b/examples/particles/emitters/trailemitter.qml
diff --git a/examples/declarative/particles/emitters/velocityfrommotion.qml b/examples/particles/emitters/velocityfrommotion.qml
index 7ad2b4d6c4..7ad2b4d6c4 100644
--- a/examples/declarative/particles/emitters/velocityfrommotion.qml
+++ b/examples/particles/emitters/velocityfrommotion.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/Button.qml b/examples/particles/exampleslauncher/content/Button.qml
index e51a9be003..e51a9be003 100644
--- a/examples/declarative/particles/exampleslauncher/content/Button.qml
+++ b/examples/particles/exampleslauncher/content/Button.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/Shell.qml b/examples/particles/exampleslauncher/content/Shell.qml
index afab77485f..afab77485f 100644
--- a/examples/declarative/particles/exampleslauncher/content/Shell.qml
+++ b/examples/particles/exampleslauncher/content/Shell.qml
diff --git a/examples/declarative/particles/exampleslauncher/content/launcher.js b/examples/particles/exampleslauncher/content/launcher.js
index a296dbd6a6..a296dbd6a6 100644
--- a/examples/declarative/particles/exampleslauncher/content/launcher.js
+++ b/examples/particles/exampleslauncher/content/launcher.js
diff --git a/examples/declarative/particles/exampleslauncher/exampleslauncher.qml b/examples/particles/exampleslauncher/exampleslauncher.qml
index 22914343ba..22914343ba 100644
--- a/examples/declarative/particles/exampleslauncher/exampleslauncher.qml
+++ b/examples/particles/exampleslauncher/exampleslauncher.qml
diff --git a/examples/declarative/particles/imageparticle/allatonce.qml b/examples/particles/imageparticle/allatonce.qml
index fbc634ec9a..fbc634ec9a 100644
--- a/examples/declarative/particles/imageparticle/allatonce.qml
+++ b/examples/particles/imageparticle/allatonce.qml
diff --git a/examples/declarative/particles/imageparticle/colored.qml b/examples/particles/imageparticle/colored.qml
index ac760b6219..ac760b6219 100644
--- a/examples/declarative/particles/imageparticle/colored.qml
+++ b/examples/particles/imageparticle/colored.qml
diff --git a/examples/declarative/particles/imageparticle/colortable.qml b/examples/particles/imageparticle/colortable.qml
index 623029dae0..623029dae0 100644
--- a/examples/declarative/particles/imageparticle/colortable.qml
+++ b/examples/particles/imageparticle/colortable.qml
diff --git a/examples/declarative/particles/imageparticle/deformation.qml b/examples/particles/imageparticle/deformation.qml
index e282927e78..e282927e78 100644
--- a/examples/declarative/particles/imageparticle/deformation.qml
+++ b/examples/particles/imageparticle/deformation.qml
diff --git a/examples/declarative/particles/imageparticle/rotation.qml b/examples/particles/imageparticle/rotation.qml
index 3a75c379ed..3a75c379ed 100644
--- a/examples/declarative/particles/imageparticle/rotation.qml
+++ b/examples/particles/imageparticle/rotation.qml
diff --git a/examples/declarative/particles/imageparticle/sharing.qml b/examples/particles/imageparticle/sharing.qml
index 27e08322d9..27e08322d9 100644
--- a/examples/declarative/particles/imageparticle/sharing.qml
+++ b/examples/particles/imageparticle/sharing.qml
diff --git a/examples/declarative/particles/imageparticle/sprites.qml b/examples/particles/imageparticle/sprites.qml
index 0fe4f31ea3..0fe4f31ea3 100644
--- a/examples/declarative/particles/imageparticle/sprites.qml
+++ b/examples/particles/imageparticle/sprites.qml
diff --git a/examples/declarative/particles/images/_explo.png b/examples/particles/images/_explo.png
index 4297245d49..4297245d49 100644
--- a/examples/declarative/particles/images/_explo.png
+++ b/examples/particles/images/_explo.png
diff --git a/examples/declarative/particles/images/backgroundLeaves.jpg b/examples/particles/images/backgroundLeaves.jpg
index 08be16751d..08be16751d 100755
--- a/examples/declarative/particles/images/backgroundLeaves.jpg
+++ b/examples/particles/images/backgroundLeaves.jpg
diff --git a/examples/declarative/particles/images/bear_tiles.png b/examples/particles/images/bear_tiles.png
index 6bbb2a9b6d..6bbb2a9b6d 100644
--- a/examples/declarative/particles/images/bear_tiles.png
+++ b/examples/particles/images/bear_tiles.png
diff --git a/examples/declarative/particles/images/candle.png b/examples/particles/images/candle.png
index 8fa3193719..8fa3193719 100644
--- a/examples/declarative/particles/images/candle.png
+++ b/examples/particles/images/candle.png
diff --git a/examples/declarative/particles/images/colortable.png b/examples/particles/images/colortable.png
index a62ceeb4a0..a62ceeb4a0 100644
--- a/examples/declarative/particles/images/colortable.png
+++ b/examples/particles/images/colortable.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png b/examples/particles/images/finalfrontier.png
index 2ba1815230..2ba1815230 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/finalfrontier.png
+++ b/examples/particles/images/finalfrontier.png
diff --git a/examples/declarative/particles/images/flower.png b/examples/particles/images/flower.png
index b5c606210e..b5c606210e 100644
--- a/examples/declarative/particles/images/flower.png
+++ b/examples/particles/images/flower.png
diff --git a/examples/declarative/particles/images/launcherIcons/allatonce.png b/examples/particles/images/launcherIcons/allatonce.png
index b61d2d50d8..b61d2d50d8 100644
--- a/examples/declarative/particles/images/launcherIcons/allatonce.png
+++ b/examples/particles/images/launcherIcons/allatonce.png
diff --git a/examples/declarative/particles/images/launcherIcons/attractor.png b/examples/particles/images/launcherIcons/attractor.png
index 4bd8040c3b..4bd8040c3b 100644
--- a/examples/declarative/particles/images/launcherIcons/attractor.png
+++ b/examples/particles/images/launcherIcons/attractor.png
diff --git a/examples/declarative/particles/images/launcherIcons/blurparticles.png b/examples/particles/images/launcherIcons/blurparticles.png
index 4337f979cb..4337f979cb 100644
--- a/examples/declarative/particles/images/launcherIcons/blurparticles.png
+++ b/examples/particles/images/launcherIcons/blurparticles.png
diff --git a/examples/declarative/particles/images/launcherIcons/close.png b/examples/particles/images/launcherIcons/close.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/images/launcherIcons/close.png
+++ b/examples/particles/images/launcherIcons/close.png
diff --git a/examples/declarative/particles/images/launcherIcons/colortable.png b/examples/particles/images/launcherIcons/colortable.png
index 8841ea30f9..8841ea30f9 100644
--- a/examples/declarative/particles/images/launcherIcons/colortable.png
+++ b/examples/particles/images/launcherIcons/colortable.png
diff --git a/examples/declarative/particles/images/launcherIcons/customaffector.png b/examples/particles/images/launcherIcons/customaffector.png
index d02e7918fa..d02e7918fa 100644
--- a/examples/declarative/particles/images/launcherIcons/customaffector.png
+++ b/examples/particles/images/launcherIcons/customaffector.png
diff --git a/examples/declarative/particles/images/launcherIcons/customemitter.png b/examples/particles/images/launcherIcons/customemitter.png
index 6d492573d1..6d492573d1 100644
--- a/examples/declarative/particles/images/launcherIcons/customemitter.png
+++ b/examples/particles/images/launcherIcons/customemitter.png
diff --git a/examples/declarative/particles/images/launcherIcons/deformation.png b/examples/particles/images/launcherIcons/deformation.png
index d1b722df01..d1b722df01 100644
--- a/examples/declarative/particles/images/launcherIcons/deformation.png
+++ b/examples/particles/images/launcherIcons/deformation.png
diff --git a/examples/declarative/particles/images/launcherIcons/delegates.png b/examples/particles/images/launcherIcons/delegates.png
index 929414cd0e..929414cd0e 100644
--- a/examples/declarative/particles/images/launcherIcons/delegates.png
+++ b/examples/particles/images/launcherIcons/delegates.png
diff --git a/examples/declarative/particles/images/launcherIcons/dynamicemitters.png b/examples/particles/images/launcherIcons/dynamicemitters.png
index 0cdef9d21e..0cdef9d21e 100644
--- a/examples/declarative/particles/images/launcherIcons/dynamicemitters.png
+++ b/examples/particles/images/launcherIcons/dynamicemitters.png
diff --git a/examples/declarative/particles/images/launcherIcons/emitmask.png b/examples/particles/images/launcherIcons/emitmask.png
index e943a4adb9..e943a4adb9 100644
--- a/examples/declarative/particles/images/launcherIcons/emitmask.png
+++ b/examples/particles/images/launcherIcons/emitmask.png
diff --git a/examples/declarative/particles/images/launcherIcons/flickr.png b/examples/particles/images/launcherIcons/flickr.png
index 4de2650280..4de2650280 100644
--- a/examples/declarative/particles/images/launcherIcons/flickr.png
+++ b/examples/particles/images/launcherIcons/flickr.png
diff --git a/examples/declarative/particles/images/launcherIcons/fragmentshader.png b/examples/particles/images/launcherIcons/fragmentshader.png
index 7c6de498d5..7c6de498d5 100644
--- a/examples/declarative/particles/images/launcherIcons/fragmentshader.png
+++ b/examples/particles/images/launcherIcons/fragmentshader.png
diff --git a/examples/declarative/particles/images/launcherIcons/gridsplosion.png b/examples/particles/images/launcherIcons/gridsplosion.png
index ec75453df6..ec75453df6 100644
--- a/examples/declarative/particles/images/launcherIcons/gridsplosion.png
+++ b/examples/particles/images/launcherIcons/gridsplosion.png
diff --git a/examples/declarative/particles/images/launcherIcons/groupgoal.png b/examples/particles/images/launcherIcons/groupgoal.png
index 69c6f64e54..69c6f64e54 100644
--- a/examples/declarative/particles/images/launcherIcons/groupgoal.png
+++ b/examples/particles/images/launcherIcons/groupgoal.png
diff --git a/examples/declarative/particles/images/launcherIcons/imagecolors.png b/examples/particles/images/launcherIcons/imagecolors.png
index 0ff13a346e..0ff13a346e 100644
--- a/examples/declarative/particles/images/launcherIcons/imagecolors.png
+++ b/examples/particles/images/launcherIcons/imagecolors.png
diff --git a/examples/declarative/particles/images/launcherIcons/list.png b/examples/particles/images/launcherIcons/list.png
index bc13263cff..bc13263cff 100644
--- a/examples/declarative/particles/images/launcherIcons/list.png
+++ b/examples/particles/images/launcherIcons/list.png
diff --git a/examples/declarative/particles/images/launcherIcons/maximumemitted.png b/examples/particles/images/launcherIcons/maximumemitted.png
index 4ef0435991..4ef0435991 100644
--- a/examples/declarative/particles/images/launcherIcons/maximumemitted.png
+++ b/examples/particles/images/launcherIcons/maximumemitted.png
diff --git a/examples/declarative/particles/images/launcherIcons/multiplepainters.png b/examples/particles/images/launcherIcons/multiplepainters.png
index a28e3c4f02..a28e3c4f02 100644
--- a/examples/declarative/particles/images/launcherIcons/multiplepainters.png
+++ b/examples/particles/images/launcherIcons/multiplepainters.png
diff --git a/examples/declarative/particles/images/launcherIcons/package.png b/examples/particles/images/launcherIcons/package.png
index eba8951c26..eba8951c26 100644
--- a/examples/declarative/particles/images/launcherIcons/package.png
+++ b/examples/particles/images/launcherIcons/package.png
diff --git a/examples/declarative/particles/images/launcherIcons/particleview.png b/examples/particles/images/launcherIcons/particleview.png
index a74f9a0340..a74f9a0340 100644
--- a/examples/declarative/particles/images/launcherIcons/particleview.png
+++ b/examples/particles/images/launcherIcons/particleview.png
diff --git a/examples/declarative/particles/images/launcherIcons/plasmapatrol.png b/examples/particles/images/launcherIcons/plasmapatrol.png
index fda852b420..fda852b420 100644
--- a/examples/declarative/particles/images/launcherIcons/plasmapatrol.png
+++ b/examples/particles/images/launcherIcons/plasmapatrol.png
diff --git a/examples/declarative/particles/images/launcherIcons/remove.png b/examples/particles/images/launcherIcons/remove.png
index c37714ee8f..c37714ee8f 100644
--- a/examples/declarative/particles/images/launcherIcons/remove.png
+++ b/examples/particles/images/launcherIcons/remove.png
diff --git a/examples/declarative/particles/images/launcherIcons/rotation.png b/examples/particles/images/launcherIcons/rotation.png
index 6a8dbea236..6a8dbea236 100644
--- a/examples/declarative/particles/images/launcherIcons/rotation.png
+++ b/examples/particles/images/launcherIcons/rotation.png
diff --git a/examples/declarative/particles/images/launcherIcons/samegame.png b/examples/particles/images/launcherIcons/samegame.png
index d00698264b..d00698264b 100644
--- a/examples/declarative/particles/images/launcherIcons/samegame.png
+++ b/examples/particles/images/launcherIcons/samegame.png
diff --git a/examples/declarative/particles/images/launcherIcons/shapeanddirection.png b/examples/particles/images/launcherIcons/shapeanddirection.png
index 9c1f910d0c..9c1f910d0c 100644
--- a/examples/declarative/particles/images/launcherIcons/shapeanddirection.png
+++ b/examples/particles/images/launcherIcons/shapeanddirection.png
diff --git a/examples/declarative/particles/images/launcherIcons/spaceexplorer.png b/examples/particles/images/launcherIcons/spaceexplorer.png
index 770584a0fa..770584a0fa 100644
--- a/examples/declarative/particles/images/launcherIcons/spaceexplorer.png
+++ b/examples/particles/images/launcherIcons/spaceexplorer.png
diff --git a/examples/declarative/particles/images/launcherIcons/spritegoal.png b/examples/particles/images/launcherIcons/spritegoal.png
index 77480c6f09..77480c6f09 100644
--- a/examples/declarative/particles/images/launcherIcons/spritegoal.png
+++ b/examples/particles/images/launcherIcons/spritegoal.png
diff --git a/examples/declarative/particles/images/launcherIcons/sprites.png b/examples/particles/images/launcherIcons/sprites.png
index 144216ac7c..144216ac7c 100644
--- a/examples/declarative/particles/images/launcherIcons/sprites.png
+++ b/examples/particles/images/launcherIcons/sprites.png
diff --git a/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png b/examples/particles/images/launcherIcons/spritevariedparticles.png
index 495bb6beee..495bb6beee 100644
--- a/examples/declarative/particles/images/launcherIcons/spritevariedparticles.png
+++ b/examples/particles/images/launcherIcons/spritevariedparticles.png
diff --git a/examples/declarative/particles/images/launcherIcons/startstop.png b/examples/particles/images/launcherIcons/startstop.png
index 0ff53196a6..0ff53196a6 100644
--- a/examples/declarative/particles/images/launcherIcons/startstop.png
+++ b/examples/particles/images/launcherIcons/startstop.png
diff --git a/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png b/examples/particles/images/launcherIcons/timedgroupchanges.png
index ec9f826495..ec9f826495 100644
--- a/examples/declarative/particles/images/launcherIcons/timedgroupchanges.png
+++ b/examples/particles/images/launcherIcons/timedgroupchanges.png
diff --git a/examples/declarative/particles/images/launcherIcons/trailemitter.png b/examples/particles/images/launcherIcons/trailemitter.png
index 39acf8b40d..39acf8b40d 100644
--- a/examples/declarative/particles/images/launcherIcons/trailemitter.png
+++ b/examples/particles/images/launcherIcons/trailemitter.png
diff --git a/examples/declarative/particles/images/launcherIcons/trails.png b/examples/particles/images/launcherIcons/trails.png
index 0337ebcfd8..0337ebcfd8 100644
--- a/examples/declarative/particles/images/launcherIcons/trails.png
+++ b/examples/particles/images/launcherIcons/trails.png
diff --git a/examples/declarative/particles/images/launcherIcons/turbulence.png b/examples/particles/images/launcherIcons/turbulence.png
index 2b9446ea90..2b9446ea90 100644
--- a/examples/declarative/particles/images/launcherIcons/turbulence.png
+++ b/examples/particles/images/launcherIcons/turbulence.png
diff --git a/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png b/examples/particles/images/launcherIcons/velocityfrommotion.png
index 79baa08293..79baa08293 100644
--- a/examples/declarative/particles/images/launcherIcons/velocityfrommotion.png
+++ b/examples/particles/images/launcherIcons/velocityfrommotion.png
diff --git a/examples/declarative/particles/images/launcherIcons/wander.png b/examples/particles/images/launcherIcons/wander.png
index d98e14b8ae..d98e14b8ae 100644
--- a/examples/declarative/particles/images/launcherIcons/wander.png
+++ b/examples/particles/images/launcherIcons/wander.png
diff --git a/examples/declarative/particles/images/matchmask.png b/examples/particles/images/matchmask.png
index e575875c55..e575875c55 100644
--- a/examples/declarative/particles/images/matchmask.png
+++ b/examples/particles/images/matchmask.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/meteor.png b/examples/particles/images/meteor.png
index e8c368aea7..e8c368aea7 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/meteor.png
+++ b/examples/particles/images/meteor.png
diff --git a/examples/declarative/particles/images/meteor_explo.png b/examples/particles/images/meteor_explo.png
index e659bfe2cf..e659bfe2cf 100644
--- a/examples/declarative/particles/images/meteor_explo.png
+++ b/examples/particles/images/meteor_explo.png
diff --git a/examples/declarative/particles/images/meteors.png b/examples/particles/images/meteors.png
index bada8a1407..bada8a1407 100644
--- a/examples/declarative/particles/images/meteors.png
+++ b/examples/particles/images/meteors.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png b/examples/particles/images/nullRock.png
index 4076327a1a..4076327a1a 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/nullRock.png
+++ b/examples/particles/images/nullRock.png
diff --git a/examples/declarative/samegame/content/pics/particle.png b/examples/particles/images/particle.png
index 5c83896d22..5c83896d22 100644
--- a/examples/declarative/samegame/content/pics/particle.png
+++ b/examples/particles/images/particle.png
diff --git a/examples/declarative/particles/images/particle2.png b/examples/particles/images/particle2.png
index 36349c6c6e..36349c6c6e 100644
--- a/examples/declarative/particles/images/particle2.png
+++ b/examples/particles/images/particle2.png
diff --git a/examples/declarative/particles/images/particle3.png b/examples/particles/images/particle3.png
index 905d8f37b8..905d8f37b8 100644
--- a/examples/declarative/particles/images/particle3.png
+++ b/examples/particles/images/particle3.png
diff --git a/examples/declarative/particles/images/particle4.png b/examples/particles/images/particle4.png
index bc95b703c1..bc95b703c1 100644
--- a/examples/declarative/particles/images/particle4.png
+++ b/examples/particles/images/particle4.png
diff --git a/examples/declarative/particles/images/particleA.png b/examples/particles/images/particleA.png
index c63acdee1f..c63acdee1f 100644
--- a/examples/declarative/particles/images/particleA.png
+++ b/examples/particles/images/particleA.png
diff --git a/examples/declarative/particles/images/portal_bg.png b/examples/particles/images/portal_bg.png
index 3c59eeabb9..3c59eeabb9 100644
--- a/examples/declarative/particles/images/portal_bg.png
+++ b/examples/particles/images/portal_bg.png
diff --git a/examples/declarative/particles/images/realLeaf1.png b/examples/particles/images/realLeaf1.png
index 6cabf29efd..6cabf29efd 100644
--- a/examples/declarative/particles/images/realLeaf1.png
+++ b/examples/particles/images/realLeaf1.png
diff --git a/examples/declarative/particles/images/realLeaf2.png b/examples/particles/images/realLeaf2.png
index bfeca861d5..bfeca861d5 100644
--- a/examples/declarative/particles/images/realLeaf2.png
+++ b/examples/particles/images/realLeaf2.png
diff --git a/examples/declarative/particles/images/realLeaf3.png b/examples/particles/images/realLeaf3.png
index b1071e862b..b1071e862b 100644
--- a/examples/declarative/particles/images/realLeaf3.png
+++ b/examples/particles/images/realLeaf3.png
diff --git a/examples/declarative/particles/images/realLeaf4.png b/examples/particles/images/realLeaf4.png
index d61d53d10e..d61d53d10e 100644
--- a/examples/declarative/particles/images/realLeaf4.png
+++ b/examples/particles/images/realLeaf4.png
diff --git a/examples/declarative/particles/images/rocket.png b/examples/particles/images/rocket.png
index a171610b03..a171610b03 100644
--- a/examples/declarative/particles/images/rocket.png
+++ b/examples/particles/images/rocket.png
diff --git a/examples/declarative/particles/images/rocket2.png b/examples/particles/images/rocket2.png
index 7110f8fdc6..7110f8fdc6 100644
--- a/examples/declarative/particles/images/rocket2.png
+++ b/examples/particles/images/rocket2.png
diff --git a/examples/declarative/particles/images/sizeInOut.png b/examples/particles/images/sizeInOut.png
index 0a306ea21a..0a306ea21a 100644
--- a/examples/declarative/particles/images/sizeInOut.png
+++ b/examples/particles/images/sizeInOut.png
diff --git a/examples/declarative/particles/images/snowflake.png b/examples/particles/images/snowflake.png
index 490887a82f..490887a82f 100644
--- a/examples/declarative/particles/images/snowflake.png
+++ b/examples/particles/images/snowflake.png
diff --git a/examples/declarative/particles/images/sparkleSize.png b/examples/particles/images/sparkleSize.png
index 752056541b..752056541b 100644
--- a/examples/declarative/particles/images/sparkleSize.png
+++ b/examples/particles/images/sparkleSize.png
diff --git a/examples/declarative/particles/plasmapatrol/content/pics/star.png b/examples/particles/images/star.png
index 0d592cfa87..0d592cfa87 100644
--- a/examples/declarative/particles/plasmapatrol/content/pics/star.png
+++ b/examples/particles/images/star.png
diff --git a/examples/declarative/particles/images/starfish_0.png b/examples/particles/images/starfish_0.png
index 8747f0236e..8747f0236e 100644
--- a/examples/declarative/particles/images/starfish_0.png
+++ b/examples/particles/images/starfish_0.png
diff --git a/examples/declarative/particles/images/starfish_1.png b/examples/particles/images/starfish_1.png
index 1f3f159d5e..1f3f159d5e 100644
--- a/examples/declarative/particles/images/starfish_1.png
+++ b/examples/particles/images/starfish_1.png
diff --git a/examples/declarative/particles/images/starfish_2.png b/examples/particles/images/starfish_2.png
index c6c7e5a676..c6c7e5a676 100644
--- a/examples/declarative/particles/images/starfish_2.png
+++ b/examples/particles/images/starfish_2.png
diff --git a/examples/declarative/particles/images/starfish_3.png b/examples/particles/images/starfish_3.png
index 307a89f815..307a89f815 100644
--- a/examples/declarative/particles/images/starfish_3.png
+++ b/examples/particles/images/starfish_3.png
diff --git a/examples/declarative/particles/images/starfish_4.png b/examples/particles/images/starfish_4.png
index d61c26545a..d61c26545a 100644
--- a/examples/declarative/particles/images/starfish_4.png
+++ b/examples/particles/images/starfish_4.png
diff --git a/examples/declarative/particles/images/starfish_mask.png b/examples/particles/images/starfish_mask.png
index 2ef74f902b..2ef74f902b 100644
--- a/examples/declarative/particles/images/starfish_mask.png
+++ b/examples/particles/images/starfish_mask.png
diff --git a/examples/declarative/modelviews/package/Delegate.qml b/examples/particles/itemparticle/content/Delegate.qml
index 97c7840cb4..97c7840cb4 100644
--- a/examples/declarative/modelviews/package/Delegate.qml
+++ b/examples/particles/itemparticle/content/Delegate.qml
diff --git a/examples/declarative/particles/itemparticle/content/Delegate2.qml b/examples/particles/itemparticle/content/Delegate2.qml
index cf60d43dc2..cf60d43dc2 100644
--- a/examples/declarative/particles/itemparticle/content/Delegate2.qml
+++ b/examples/particles/itemparticle/content/Delegate2.qml
diff --git a/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml b/examples/particles/itemparticle/content/ExpandingDelegate.qml
index 87f723d3f7..87f723d3f7 100644
--- a/examples/declarative/particles/itemparticle/content/ExpandingDelegate.qml
+++ b/examples/particles/itemparticle/content/ExpandingDelegate.qml
diff --git a/examples/declarative/particles/itemparticle/content/RssModel.qml b/examples/particles/itemparticle/content/RssModel.qml
index 46027600b3..46027600b3 100644
--- a/examples/declarative/particles/itemparticle/content/RssModel.qml
+++ b/examples/particles/itemparticle/content/RssModel.qml
diff --git a/examples/declarative/particles/itemparticle/content/bubble.png b/examples/particles/itemparticle/content/bubble.png
index c7f479e9e3..c7f479e9e3 100644
--- a/examples/declarative/particles/itemparticle/content/bubble.png
+++ b/examples/particles/itemparticle/content/bubble.png
diff --git a/examples/declarative/photoviewer/PhotoViewerCore/script/script.js b/examples/particles/itemparticle/content/script.js
index e8ef93a847..e8ef93a847 100644
--- a/examples/declarative/photoviewer/PhotoViewerCore/script/script.js
+++ b/examples/particles/itemparticle/content/script.js
diff --git a/examples/declarative/particles/itemparticle/delegates.qml b/examples/particles/itemparticle/delegates.qml
index 58734d320a..58734d320a 100644
--- a/examples/declarative/particles/itemparticle/delegates.qml
+++ b/examples/particles/itemparticle/delegates.qml
diff --git a/examples/declarative/particles/itemparticle/particleview.qml b/examples/particles/itemparticle/particleview.qml
index 774539a958..774539a958 100644
--- a/examples/declarative/particles/itemparticle/particleview.qml
+++ b/examples/particles/itemparticle/particleview.qml
diff --git a/examples/particles/particles.pro b/examples/particles/particles.pro
new file mode 100644
index 0000000000..967108504e
--- /dev/null
+++ b/examples/particles/particles.pro
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/declarative/particles/simple/dynamiccomparison.qml b/examples/particles/simple/dynamiccomparison.qml
index a7cdb9b32a..a7cdb9b32a 100644
--- a/examples/declarative/particles/simple/dynamiccomparison.qml
+++ b/examples/particles/simple/dynamiccomparison.qml
diff --git a/examples/declarative/particles/simple/dynamicemitters.qml b/examples/particles/simple/dynamicemitters.qml
index 4431ebe82e..4431ebe82e 100644
--- a/examples/declarative/particles/simple/dynamicemitters.qml
+++ b/examples/particles/simple/dynamicemitters.qml
diff --git a/examples/declarative/particles/simple/multiplepainters.qml b/examples/particles/simple/multiplepainters.qml
index c1b85caa2d..c1b85caa2d 100644
--- a/examples/declarative/particles/simple/multiplepainters.qml
+++ b/examples/particles/simple/multiplepainters.qml
diff --git a/examples/declarative/particles/simple/startstop.qml b/examples/particles/simple/startstop.qml
index 62105b28a0..62105b28a0 100644
--- a/examples/declarative/particles/simple/startstop.qml
+++ b/examples/particles/simple/startstop.qml
diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/qml/cppextensions/cppextensions.pro
index cde19b5c90..cde19b5c90 100644
--- a/examples/declarative/cppextensions/cppextensions.pro
+++ b/examples/qml/cppextensions/cppextensions.pro
diff --git a/examples/declarative/cppextensions/cppextensions.qmlproject b/examples/qml/cppextensions/cppextensions.qmlproject
index 6b362842cb..6b362842cb 100644
--- a/examples/declarative/cppextensions/cppextensions.qmlproject
+++ b/examples/qml/cppextensions/cppextensions.qmlproject
diff --git a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir
index 6be88bccec..6be88bccec 100644
--- a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
+++ b/examples/qml/cppextensions/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/qml/cppextensions/imageprovider/imageprovider-example.qml
index fe2f1b130b..fe2f1b130b 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+++ b/examples/qml/cppextensions/imageprovider/imageprovider-example.qml
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
index 7fe4b72c08..7fe4b72c08 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.cpp
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/qml/cppextensions/imageprovider/imageprovider.pro
index dd128d56a8..dd128d56a8 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.pro
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject b/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
+++ b/examples/qml/cppextensions/imageprovider/imageprovider.qmlproject
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp
index 2bad2aa285..2bad2aa285 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/main.cpp
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 479af364d0..479af364d0 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml b/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml
index b2d46a991f..b2d46a991f 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+++ b/examples/qml/cppextensions/networkaccessmanagerfactory/view.qml
diff --git a/examples/declarative/cppextensions/plugins/README b/examples/qml/cppextensions/plugins/README
index f4f9074059..f4f9074059 100644
--- a/examples/declarative/cppextensions/plugins/README
+++ b/examples/qml/cppextensions/plugins/README
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index eac9226a00..eac9226a00 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
diff --git a/examples/declarative/toys/clocks/content/center.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png
index 7fbd802a44..7fbd802a44 100644
--- a/examples/declarative/toys/clocks/content/center.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/center.png
diff --git a/examples/declarative/toys/clocks/content/clock.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png
index 462edacc0e..462edacc0e 100644
--- a/examples/declarative/toys/clocks/content/clock.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/clock.png
diff --git a/examples/declarative/toys/clocks/content/hour.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png
index f8061a1235..f8061a1235 100644
--- a/examples/declarative/toys/clocks/content/hour.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/hour.png
diff --git a/examples/declarative/toys/clocks/content/minute.png b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png
index 1297ec7c2b..1297ec7c2b 100644
--- a/examples/declarative/toys/clocks/content/minute.png
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/minute.png
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir
index e1288cfac0..e1288cfac0 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
+++ b/examples/qml/cppextensions/plugins/com/nokia/TimeExample/qmldir
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/qml/cppextensions/plugins/plugin.cpp
index 4ba0a928eb..4ba0a928eb 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/qml/cppextensions/plugins/plugin.cpp
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/qml/cppextensions/plugins/plugins.pro
index a28582a07a..a28582a07a 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/qml/cppextensions/plugins/plugins.pro
diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/qml/cppextensions/plugins/plugins.qml
index f1048ddd36..f1048ddd36 100644
--- a/examples/declarative/cppextensions/plugins/plugins.qml
+++ b/examples/qml/cppextensions/plugins/plugins.qml
diff --git a/examples/declarative/cppextensions/plugins/plugins.qmlproject b/examples/qml/cppextensions/plugins/plugins.qmlproject
index 771ab45b66..771ab45b66 100644
--- a/examples/declarative/cppextensions/plugins/plugins.qmlproject
+++ b/examples/qml/cppextensions/plugins/plugins.qmlproject
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/qml/cppextensions/referenceexamples/adding/adding.pro
index 1a972926b7..1a972926b7 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/qml/cppextensions/referenceexamples/adding/adding.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc b/examples/qml/cppextensions/referenceexamples/adding/adding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
+++ b/examples/qml/cppextensions/referenceexamples/adding/adding.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/example.qml b/examples/qml/cppextensions/referenceexamples/adding/example.qml
index 3b2ca34d10..3b2ca34d10 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/adding/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/qml/cppextensions/referenceexamples/adding/main.cpp
index 4c1918b6de..4c1918b6de 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/adding/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.cpp b/examples/qml/cppextensions/referenceexamples/adding/person.cpp
index 0e78b0b77b..0e78b0b77b 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/adding/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.h b/examples/qml/cppextensions/referenceexamples/adding/person.h
index 45fb2f3297..45fb2f3297 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/person.h
+++ b/examples/qml/cppextensions/referenceexamples/adding/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/qml/cppextensions/referenceexamples/attached/attached.pro
index 4cfd4e0aed..4cfd4e0aed 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/qml/cppextensions/referenceexamples/attached/attached.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc b/examples/qml/cppextensions/referenceexamples/attached/attached.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
+++ b/examples/qml/cppextensions/referenceexamples/attached/attached.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
index feefef4fe1..feefef4fe1 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h
index c789c0bd51..c789c0bd51 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/example.qml b/examples/qml/cppextensions/referenceexamples/attached/example.qml
index 6a83af2804..6a83af2804 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/attached/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/qml/cppextensions/referenceexamples/attached/main.cpp
index 4c2c3003fe..4c2c3003fe 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.cpp b/examples/qml/cppextensions/referenceexamples/attached/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.h b/examples/qml/cppextensions/referenceexamples/attached/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/person.h
+++ b/examples/qml/cppextensions/referenceexamples/attached/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/qml/cppextensions/referenceexamples/binding/binding.pro
index 2add33fa47..2add33fa47 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/qml/cppextensions/referenceexamples/binding/binding.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc b/examples/qml/cppextensions/referenceexamples/binding/binding.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
+++ b/examples/qml/cppextensions/referenceexamples/binding/binding.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
index 4f5acdfb75..4f5acdfb75 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h
index 376d107f26..376d107f26 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/example.qml b/examples/qml/cppextensions/referenceexamples/binding/example.qml
index 99a0098ff6..99a0098ff6 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/binding/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
index df4dbec9c4..df4dbec9c4 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h
index a9f3a94544..a9f3a94544 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/happybirthdaysong.h
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/qml/cppextensions/referenceexamples/binding/main.cpp
index 551d24b702..551d24b702 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.cpp b/examples/qml/cppextensions/referenceexamples/binding/person.cpp
index 89e7127caf..89e7127caf 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.h b/examples/qml/cppextensions/referenceexamples/binding/person.h
index d0f196b95c..d0f196b95c 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/person.h
+++ b/examples/qml/cppextensions/referenceexamples/binding/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
index 1859ca9461..1859ca9461 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h
index 4315d3727e..4315d3727e 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro
index 742b85b683..742b85b683 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/cppextensions/referenceexamples/coercion/coercion.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc b/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
+++ b/examples/qml/cppextensions/referenceexamples/coercion/coercion.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/example.qml b/examples/qml/cppextensions/referenceexamples/coercion/example.qml
index 25791f38f8..25791f38f8 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/coercion/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/qml/cppextensions/referenceexamples/coercion/main.cpp
index 95b309de4c..95b309de4c 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp b/examples/qml/cppextensions/referenceexamples/coercion/person.cpp
index b28d63216e..b28d63216e 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.h b/examples/qml/cppextensions/referenceexamples/coercion/person.h
index dc4ae43dd6..dc4ae43dd6 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/person.h
+++ b/examples/qml/cppextensions/referenceexamples/coercion/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
index 1859ca9461..1859ca9461 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h
index cfca6689db..cfca6689db 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/qml/cppextensions/referenceexamples/default/default.pro
index 6533cdd7d3..6533cdd7d3 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.pro
+++ b/examples/qml/cppextensions/referenceexamples/default/default.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.qrc b/examples/qml/cppextensions/referenceexamples/default/default.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.qrc
+++ b/examples/qml/cppextensions/referenceexamples/default/default.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/default/example.qml b/examples/qml/cppextensions/referenceexamples/default/example.qml
index 9ef24b59b7..9ef24b59b7 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/default/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/default/main.cpp b/examples/qml/cppextensions/referenceexamples/default/main.cpp
index 3a03279129..3a03279129 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.cpp b/examples/qml/cppextensions/referenceexamples/default/person.cpp
index 5a615a1ecd..5a615a1ecd 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.h b/examples/qml/cppextensions/referenceexamples/default/person.h
index d85672798c..d85672798c 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/person.h
+++ b/examples/qml/cppextensions/referenceexamples/default/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/example.qml b/examples/qml/cppextensions/referenceexamples/extended/example.qml
index 642a95d443..642a95d443 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/extended/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/qml/cppextensions/referenceexamples/extended/extended.pro
index 3d9f59c470..3d9f59c470 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/qml/cppextensions/referenceexamples/extended/extended.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc b/examples/qml/cppextensions/referenceexamples/extended/extended.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
+++ b/examples/qml/cppextensions/referenceexamples/extended/extended.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp
index 8f7fd8aa93..8f7fd8aa93 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
+++ b/examples/qml/cppextensions/referenceexamples/extended/lineedit.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h b/examples/qml/cppextensions/referenceexamples/extended/lineedit.h
index fa8c75df78..fa8c75df78 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
+++ b/examples/qml/cppextensions/referenceexamples/extended/lineedit.h
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp b/examples/qml/cppextensions/referenceexamples/extended/main.cpp
index 3c580396f2..3c580396f2 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/extended/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
index 1859ca9461..1859ca9461 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h
index 491903adc5..491903adc5 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml b/examples/qml/cppextensions/referenceexamples/grouped/example.qml
index 9ae80f222e..9ae80f222e 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/grouped/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro
index aab0c8469a..aab0c8469a 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/cppextensions/referenceexamples/grouped/grouped.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc b/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
+++ b/examples/qml/cppextensions/referenceexamples/grouped/grouped.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp b/examples/qml/cppextensions/referenceexamples/grouped/main.cpp
index de7d714c52..de7d714c52 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp b/examples/qml/cppextensions/referenceexamples/grouped/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.h b/examples/qml/cppextensions/referenceexamples/grouped/person.h
index dea715bacb..dea715bacb 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/person.h
+++ b/examples/qml/cppextensions/referenceexamples/grouped/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
index 35444f505a..35444f505a 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h
index e49afdb78d..e49afdb78d 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/example.qml b/examples/qml/cppextensions/referenceexamples/methods/example.qml
index 9119835e04..9119835e04 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/methods/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/main.cpp b/examples/qml/cppextensions/referenceexamples/methods/main.cpp
index d037d88f20..d037d88f20 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/qml/cppextensions/referenceexamples/methods/methods.pro
index ee28355188..ee28355188 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/qml/cppextensions/referenceexamples/methods/methods.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.qrc b/examples/qml/cppextensions/referenceexamples/methods/methods.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.qrc
+++ b/examples/qml/cppextensions/referenceexamples/methods/methods.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/person.cpp b/examples/qml/cppextensions/referenceexamples/methods/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/person.h b/examples/qml/cppextensions/referenceexamples/methods/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/person.h
+++ b/examples/qml/cppextensions/referenceexamples/methods/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
index 0038cd0a41..0038cd0a41 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h
index 2c3d128b6d..2c3d128b6d 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/example.qml b/examples/qml/cppextensions/referenceexamples/properties/example.qml
index 36ee952243..36ee952243 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/properties/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp b/examples/qml/cppextensions/referenceexamples/properties/main.cpp
index 421ce9fbaa..421ce9fbaa 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.cpp b/examples/qml/cppextensions/referenceexamples/properties/person.cpp
index 30d1e46e5a..30d1e46e5a 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.h b/examples/qml/cppextensions/referenceexamples/properties/person.h
index dd3ad4d188..dd3ad4d188 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/person.h
+++ b/examples/qml/cppextensions/referenceexamples/properties/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/qml/cppextensions/referenceexamples/properties/properties.pro
index 936d0ea429..936d0ea429 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/qml/cppextensions/referenceexamples/properties/properties.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc b/examples/qml/cppextensions/referenceexamples/properties/properties.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
+++ b/examples/qml/cppextensions/referenceexamples/properties/properties.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro b/examples/qml/cppextensions/referenceexamples/referenceexamples.pro
index 505cefd331..505cefd331 100644
--- a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
+++ b/examples/qml/cppextensions/referenceexamples/referenceexamples.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject b/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
+++ b/examples/qml/cppextensions/referenceexamples/referenceexamples.qmlproject
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
index d576c2a278..d576c2a278 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h
index 45ad4f0acf..45ad4f0acf 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/example.qml b/examples/qml/cppextensions/referenceexamples/signal/example.qml
index 796c2f32a1..796c2f32a1 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/signal/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/qml/cppextensions/referenceexamples/signal/main.cpp
index 5800cf450f..5800cf450f 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.cpp b/examples/qml/cppextensions/referenceexamples/signal/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.h b/examples/qml/cppextensions/referenceexamples/signal/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/person.h
+++ b/examples/qml/cppextensions/referenceexamples/signal/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/qml/cppextensions/referenceexamples/signal/signal.pro
index 8ffdb50f90..8ffdb50f90 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/qml/cppextensions/referenceexamples/signal/signal.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc b/examples/qml/cppextensions/referenceexamples/signal/signal.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
+++ b/examples/qml/cppextensions/referenceexamples/signal/signal.qrc
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
index 09137c41a8..09137c41a8 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h
index 5d561da807..5d561da807 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.h
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml b/examples/qml/cppextensions/referenceexamples/valuesource/example.qml
index 04c3048e9e..04c3048e9e 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/example.qml
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
index 629c354543..629c354543 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
index 9721350435..9721350435 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp
index 53d676dfbe..53d676dfbe 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/main.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp
index 7afcdc6ca6..7afcdc6ca6 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/person.cpp
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.h b/examples/qml/cppextensions/referenceexamples/valuesource/person.h
index 032eca3c17..032eca3c17 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/person.h
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro
index a978d8452a..a978d8452a 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.pro
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc
index e2fa01d5e7..e2fa01d5e7 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/valuesource.qrc
diff --git a/examples/declarative/i18n/i18n.qml b/examples/qml/i18n/i18n.qml
index f8bf30d0f0..f8bf30d0f0 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/qml/i18n/i18n.qml
diff --git a/examples/declarative/i18n/i18n/base.ts b/examples/qml/i18n/i18n/base.ts
index 82547a1f93..82547a1f93 100644
--- a/examples/declarative/i18n/i18n/base.ts
+++ b/examples/qml/i18n/i18n/base.ts
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.ts b/examples/qml/i18n/i18n/qml_en_AU.ts
index e991affe7f..e991affe7f 100644
--- a/examples/declarative/i18n/i18n/qml_en_AU.ts
+++ b/examples/qml/i18n/i18n/qml_en_AU.ts
diff --git a/examples/declarative/i18n/i18n/qml_fr.ts b/examples/qml/i18n/i18n/qml_fr.ts
index 365abd95c2..365abd95c2 100644
--- a/examples/declarative/i18n/i18n/qml_fr.ts
+++ b/examples/qml/i18n/i18n/qml_fr.ts
diff --git a/examples/declarative/locale/locale.qml b/examples/qml/locale/locale.qml
index 08d08d6bbd..08d08d6bbd 100644
--- a/examples/declarative/locale/locale.qml
+++ b/examples/qml/locale/locale.qml
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
new file mode 100644
index 0000000000..967108504e
--- /dev/null
+++ b/examples/qml/qml.pro
@@ -0,0 +1 @@
+TEMPLATE = subdirs
diff --git a/examples/declarative/script/script.pro b/examples/qml/script/script.pro
index 98c1bbc5ee..98c1bbc5ee 100644
--- a/examples/declarative/script/script.pro
+++ b/examples/qml/script/script.pro
diff --git a/examples/declarative/script/shell/main.cpp b/examples/qml/script/shell/main.cpp
index 9f0edf4a25..9f0edf4a25 100644
--- a/examples/declarative/script/shell/main.cpp
+++ b/examples/qml/script/shell/main.cpp
diff --git a/examples/declarative/script/shell/shell.pro b/examples/qml/script/shell/shell.pro
index 00191ab3d0..00191ab3d0 100644
--- a/examples/declarative/script/shell/shell.pro
+++ b/examples/qml/script/shell/shell.pro
diff --git a/examples/declarative/xml/xmlhttprequest/data.xml b/examples/qml/xmlhttprequest/data.xml
index 8b7f1e116d..8b7f1e116d 100644
--- a/examples/declarative/xml/xmlhttprequest/data.xml
+++ b/examples/qml/xmlhttprequest/data.xml
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml b/examples/qml/xmlhttprequest/xmlhttprequest-example.qml
index 28ba078160..28ba078160 100644
--- a/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
+++ b/examples/qml/xmlhttprequest/xmlhttprequest-example.qml
diff --git a/examples/qtquick/accessibility/accessibility.pro b/examples/qtquick/accessibility/accessibility.pro
new file mode 100644
index 0000000000..20d68e0c5c
--- /dev/null
+++ b/examples/qtquick/accessibility/accessibility.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility
+qml.files = accessibility.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/accessibility
+INSTALLS += target qml
+
diff --git a/examples/declarative/accessibility/accessibility.qml b/examples/qtquick/accessibility/accessibility.qml
index 6fdcd38ac6..ff115ab4b3 100644
--- a/examples/declarative/accessibility/accessibility.qml
+++ b/examples/qtquick/accessibility/accessibility.qml
@@ -40,13 +40,19 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Window 2.0
-import "widgets"
+import "content"
+
+/*!
+    \title QtQuick Examples - Accessibility
+    \example qtquick/accessibility
+    \brief This example has accessible buttons.
+
+*/
 
 Rectangle {
     id: window
 
-    width: 360; height: 300
+    width: 320; height: 480
     color: "white"
 
     Column {
@@ -70,7 +76,6 @@ Rectangle {
                 Accessible.role: Accessible.StaticText
                 Accessible.name: text
                 text: "Subject:"
-                width: 50
             }
             Rectangle {
                 id: subjectBorder
@@ -79,7 +84,7 @@ Rectangle {
                 border.width: 1
                 border.color: "black"
                 height: subjectEdit.height
-                width: 304
+                width: 240
                 TextInput {
                     id: subjectEdit
                     text: "Vacation plans"
@@ -92,8 +97,8 @@ Rectangle {
             property alias text : textEdit.text
             border.width: 1
             border.color: "black"
-            width: parent.width
-            height: textEdit.height
+            width: parent.width - 2
+            height: parent.height - (textBorder.y + column.spacing)
             TextEdit {
                 id: textEdit
                 text: "Hi, we're going to the Dolomites this summer. Weren't you also going to northern Italy? \n\nbest wishes, your friend Luke"
diff --git a/examples/qtquick/accessibility/accessibility.qmlproject b/examples/qtquick/accessibility/accessibility.qmlproject
new file mode 100644
index 0000000000..04a3190914
--- /dev/null
+++ b/examples/qtquick/accessibility/accessibility.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "accessibility.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+}
diff --git a/examples/declarative/accessibility/widgets/Button.qml b/examples/qtquick/accessibility/content/Button.qml
index 4a076fa428..33cee8036c 100644
--- a/examples/declarative/accessibility/widgets/Button.qml
+++ b/examples/qtquick/accessibility/content/Button.qml
@@ -44,6 +44,7 @@ import QtQuick 2.0
 Rectangle {
     id: button
 
+    property bool checked: false
     property alias text : buttonText.text
     Accessible.name: text
     Accessible.description: "This button does " + text
diff --git a/examples/qtquick/accessibility/main.cpp b/examples/qtquick/accessibility/main.cpp
new file mode 100644
index 0000000000..89e23b477b
--- /dev/null
+++ b/examples/qtquick/accessibility/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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(accessibility)
diff --git a/examples/qtquick/animation/animation.pro b/examples/qtquick/animation/animation.pro
new file mode 100644
index 0000000000..7e4cf9ef66
--- /dev/null
+++ b/examples/qtquick/animation/animation.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation
+qml.files = animation.qml  basics  behaviors  easing pathanimation  pathinterpolator  states
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/animation
+INSTALLS += target qml
+
diff --git a/examples/declarative/animation/animation.qml b/examples/qtquick/animation/animation.qml
index 7c5829e790..62a85a9cfa 100644
--- a/examples/declarative/animation/animation.qml
+++ b/examples/qtquick/animation/animation.qml
@@ -39,19 +39,47 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared" as Examples
+
+/*!
+    \title QtQuick Examples - Animation
+    \example qtquick/animation
+    \brief This is a collection of QML Animation examples.
+    \image qml-animations-example.png
+
+    This is a collection of small QML examples relating to animation. Each example is
+    a small QML file emphasizing a particular element or feature.
+
+    ColorAnimation demonstrates using a color animation to fade a sky from day to night.
+
+    PropertyAnimation demonstrates using a number animation to bounce a circle up and down.
+
+    Behaviors demonstrates using behaviors to animate moving a rectangle to whereever you click.
+
+    Wiggly Text demonstrates using more complex behaviors to animate and wiggle some text around as you drag it.
+
+    Easing Curves shows off all the easing curves available in Qt Quick animations.
+
+    States demonstrates how the properties of an item can vary between states.
+
+    Transitions takes the States example and animates the property changes.
+
+    PathAnimation animates an image along a beizer curve using a PathAnimation.
+
+    PathInterpolator animates an image along the same beizer curve, using a PathInterpolator instead.
+*/
 
 Item {
     height: 480
     width: 320
-    LauncherList {
+    Examples.LauncherList {
         id: ll
         anchors.fill: parent
         Component.onCompleted: {
             addExample("ColorAnimation", "Interpolates between colors",  Qt.resolvedUrl("basics/color-animation.qml"));
             addExample("PropertyAnimation", "Interpolates between numbers", Qt.resolvedUrl("basics/property-animation.qml"));
             addExample("Behaviors", "Animates procedural movement", Qt.resolvedUrl("behaviors/behavior-example.qml"));
-            addExample("WigglyText", "Text that wiggles as you drag it", Qt.resolvedUrl("behaviors/wigglytext.qml"));
+            addExample("Wiggly Text", "Text that wiggles as you drag it", Qt.resolvedUrl("behaviors/wigglytext.qml"));
             addExample("Easing Curves", "Compare available easing curves", Qt.resolvedUrl("easing/easing.qml"));
             addExample("States", "Simple states", Qt.resolvedUrl("states/states.qml"));
             addExample("Transitions", "Simple states with animated transitions", Qt.resolvedUrl("states/transitions.qml"));
diff --git a/examples/declarative/animation/animation.qmlproject b/examples/qtquick/animation/animation.qmlproject
index 2e96daa881..2e96daa881 100644
--- a/examples/declarative/animation/animation.qmlproject
+++ b/examples/qtquick/animation/animation.qmlproject
diff --git a/examples/declarative/animation/basics/color-animation.qml b/examples/qtquick/animation/basics/color-animation.qml
index a54091d7dd..f1bf40c40b 100644
--- a/examples/declarative/animation/basics/color-animation.qml
+++ b/examples/qtquick/animation/basics/color-animation.qml
@@ -43,7 +43,7 @@ import QtQuick.Particles 2.0
 
 Item {
     id: window
-    width: 640; height: 480
+    width: 320; height: 480
 
     // Let's draw the sky...
     Rectangle {
diff --git a/examples/declarative/modelviews/parallax/content/pics/face-smile.png b/examples/qtquick/animation/basics/images/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/modelviews/parallax/content/pics/face-smile.png
+++ b/examples/qtquick/animation/basics/images/face-smile.png
diff --git a/examples/declarative/animation/basics/images/moon.png b/examples/qtquick/animation/basics/images/moon.png
index 9407b2b4f0..9407b2b4f0 100644
--- a/examples/declarative/animation/basics/images/moon.png
+++ b/examples/qtquick/animation/basics/images/moon.png
diff --git a/examples/declarative/animation/basics/images/shadow.png b/examples/qtquick/animation/basics/images/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/declarative/animation/basics/images/shadow.png
+++ b/examples/qtquick/animation/basics/images/shadow.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/star.png b/examples/qtquick/animation/basics/images/star.png
index 27ef924267..27ef924267 100644
--- a/examples/declarative/toys/dynamicscene/content/images/star.png
+++ b/examples/qtquick/animation/basics/images/star.png
diff --git a/examples/declarative/toys/dynamicscene/content/images/sun.png b/examples/qtquick/animation/basics/images/sun.png
index 7713ca5ce7..7713ca5ce7 100644
--- a/examples/declarative/toys/dynamicscene/content/images/sun.png
+++ b/examples/qtquick/animation/basics/images/sun.png
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/qtquick/animation/basics/property-animation.qml
index 4a4d3e3b2a..4a4d3e3b2a 100644
--- a/examples/declarative/animation/basics/property-animation.qml
+++ b/examples/qtquick/animation/basics/property-animation.qml
diff --git a/examples/declarative/animation/behaviors/SideRect.qml b/examples/qtquick/animation/behaviors/SideRect.qml
index 623c6965d8..623c6965d8 100644
--- a/examples/declarative/animation/behaviors/SideRect.qml
+++ b/examples/qtquick/animation/behaviors/SideRect.qml
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/qtquick/animation/behaviors/behavior-example.qml
index 89fc9992b6..a88d7c8c7b 100644
--- a/examples/declarative/animation/behaviors/behavior-example.qml
+++ b/examples/qtquick/animation/behaviors/behavior-example.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.0
 
 Rectangle {
-    width: 600; height: 400
+    width: 320; height: 480
     color: "#343434"
 
     Rectangle {
diff --git a/examples/declarative/animation/behaviors/wigglytext.qml b/examples/qtquick/animation/behaviors/wigglytext.qml
index e2ed472088..4bb94da100 100644
--- a/examples/declarative/animation/behaviors/wigglytext.qml
+++ b/examples/qtquick/animation/behaviors/wigglytext.qml
@@ -43,10 +43,10 @@ import QtQuick 2.0
 Rectangle {
     id: container
 
-    property string text: "Drag this text..."
+    property string text: "Drag me!"
     property bool animated: true
 
-    width: 640; height: 480; color: "#474747"; focus: true
+    width: 320; height: 480; color: "#474747"; focus: true
 
     Keys.onPressed: {
         if (event.key == Qt.Key_Delete || event.key == Qt.Key_Backspace)
@@ -86,7 +86,7 @@ Rectangle {
             id: letter
             property variant follow
 
-            x: follow ? follow.x + follow.width : container.width / 3
+            x: follow ? follow.x + follow.width : container.width / 6
             y: follow ? follow.y : container.height / 2
 
             font.pixelSize: 40; font.bold: true
diff --git a/examples/declarative/toys/clocks/content/QuitButton.qml b/examples/qtquick/animation/easing/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/toys/clocks/content/QuitButton.qml
+++ b/examples/qtquick/animation/easing/content/QuitButton.qml
diff --git a/examples/declarative/toys/clocks/content/quit.png b/examples/qtquick/animation/easing/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/toys/clocks/content/quit.png
+++ b/examples/qtquick/animation/easing/content/quit.png
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/qtquick/animation/easing/easing.qml
index 207b653d6e..8977029fb3 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/qtquick/animation/easing/easing.qml
@@ -43,7 +43,7 @@ import "content"
 
 Rectangle {
     id: window
-    width: 600; height: 460; color: "#232323"
+    width: 320; height: 480; color: "#232323"
 
     property var easingCurve: [ 0.2, 0.2, 0.13, 0.65, 0.2, 0.8,
                                 0.624, 0.98, 0.93, 0.95, 1, 1 ]
@@ -141,22 +141,9 @@ Rectangle {
 
     Flickable {
         anchors.fill: parent
-        contentHeight: layout.height+50
-        Rectangle {
-            id: titlePane
-            color: "#444444"
-            height: 35
-            anchors { top: parent.top; left: parent.left; right: parent.right }
-            QuitButton {
-                id: quitButton
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.right: parent.right
-                anchors.rightMargin: 10
-            }
-        }
+        contentHeight: layout.height
         Column {
             id: layout
-            anchors { top: titlePane.bottom; topMargin: 10; left: parent.left; right: parent.right }
             Repeater { model: easingTypes; delegate: delegate }
         }
     }
diff --git a/examples/qtquick/animation/main.cpp b/examples/qtquick/animation/main.cpp
new file mode 100644
index 0000000000..799dfd7725
--- /dev/null
+++ b/examples/qtquick/animation/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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(animation)
diff --git a/examples/declarative/animation/pathanimation/pathanimation.qml b/examples/qtquick/animation/pathanimation/pathanimation.qml
index 4d0a31bdf8..f995218c6c 100644
--- a/examples/declarative/animation/pathanimation/pathanimation.qml
+++ b/examples/qtquick/animation/pathanimation/pathanimation.qml
@@ -42,8 +42,8 @@ import QtQuick 2.0
 
 Rectangle {
     id: window
-    width: 400
-    height: 400
+    width: 320
+    height: 480
 
     Canvas {
         id: canvas
@@ -51,6 +51,7 @@ Rectangle {
         smooth: true
 
         onPaint: {
+            var context = canvas.getContext("2d")
             context.clearRect(0, 0, width, height)
             context.strokeStyle = "black"
             context.path = pathAnim.path
@@ -58,27 +59,33 @@ Rectangle {
         }
     }
 
-    PathAnimation {
-        id: pathAnim
+    SequentialAnimation {
+        running: true
+        loops: -1
 
-        duration: 2000
-        easing.type: Easing.InQuad
+        PauseAnimation { duration: 1000 }
+        PathAnimation {
+            id: pathAnim
 
-        target: box
-        orientation: PathAnimation.RightFirst
-        anchorPoint: Qt.point(box.width/2, box.height/2)
-        path: Path {
-            startX: 50; startY: 50
+            duration: 2000
+            easing.type: Easing.InQuad
 
-            PathCubic {
-                x: window.width - 50
-                y: window.height - 50
+            target: box
+            orientation: PathAnimation.RightFirst
+            anchorPoint: Qt.point(box.width/2, box.height/2)
+            path: Path {
+                startX: 50; startY: 50
 
-                control1X: x; control1Y: 50
-                control2X: 50; control2Y: y
-            }
+                PathCubic {
+                    x: window.width - 50
+                    y: window.height - 50
+
+                    control1X: x; control1Y: 50
+                    control2X: 50; control2Y: y
+                }
 
-            onChanged: canvas.requestPaint()
+                onChanged: canvas.requestPaint()
+            }
         }
     }
 
@@ -95,14 +102,4 @@ Rectangle {
             text: "Box"
         }
     }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: pathAnim.restart()
-    }
-
-    Text {
-        text: "Click anywhere to animate along the path"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
 }
diff --git a/examples/declarative/animation/pathinterpolator/pathinterpolator.qml b/examples/qtquick/animation/pathinterpolator/pathinterpolator.qml
index 67a34ce582..5a137c732d 100644
--- a/examples/declarative/animation/pathinterpolator/pathinterpolator.qml
+++ b/examples/qtquick/animation/pathinterpolator/pathinterpolator.qml
@@ -42,8 +42,8 @@ import QtQuick 2.0
 
 Rectangle {
     id: window
-    width: 400
-    height: 400
+    width: 320
+    height: 480
 
     Canvas {
         id: canvas
@@ -51,6 +51,7 @@ Rectangle {
         smooth: true
 
         onPaint: {
+            var context = canvas.getContext("2d")
             context.clearRect(0, 0, width, height)
             context.strokeStyle = "black"
             context.path = motionPath.path
@@ -75,12 +76,17 @@ Rectangle {
             onChanged: canvas.requestPaint()
         }
 
-        NumberAnimation on progress {
-            id: progressAnim
-            running: false
-            from: 0; to: 1
-            duration: 2000
-            easing.type: Easing.InQuad
+        SequentialAnimation on progress {
+            running: true
+            loops: -1
+            PauseAnimation { duration: 1000 }
+            NumberAnimation {
+                id: progressAnim
+                running: false
+                from: 0; to: 1
+                duration: 2000
+                easing.type: Easing.InQuad
+            }
         }
     }
 
@@ -103,13 +109,4 @@ Rectangle {
         }
     }
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: progressAnim.restart()
-    }
-
-    Text {
-        text: "Click anywhere to animate along the path"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
 }
diff --git a/examples/declarative/animation/states/qt-logo.png b/examples/qtquick/animation/states/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/animation/states/qt-logo.png
+++ b/examples/qtquick/animation/states/qt-logo.png
diff --git a/examples/declarative/animation/states/states.qml b/examples/qtquick/animation/states/states.qml
index 7ca56a9295..7ca56a9295 100644
--- a/examples/declarative/animation/states/states.qml
+++ b/examples/qtquick/animation/states/states.qml
diff --git a/examples/declarative/animation/states/transitions.qml b/examples/qtquick/animation/states/transitions.qml
index d57924d6d2..d57924d6d2 100644
--- a/examples/declarative/animation/states/transitions.qml
+++ b/examples/qtquick/animation/states/transitions.qml
diff --git a/examples/declarative/canvas/bezierCurve/bezierCurve.qml b/examples/qtquick/canvas/bezierCurve/bezierCurve.qml
index f57839b0a5..f57839b0a5 100644
--- a/examples/declarative/canvas/bezierCurve/bezierCurve.qml
+++ b/examples/qtquick/canvas/bezierCurve/bezierCurve.qml
diff --git a/examples/declarative/canvas/clip/clip.qml b/examples/qtquick/canvas/clip/clip.qml
index d861ff0a46..d861ff0a46 100644
--- a/examples/declarative/canvas/clip/clip.qml
+++ b/examples/qtquick/canvas/clip/clip.qml
diff --git a/examples/declarative/canvas/contents/Button.qml b/examples/qtquick/canvas/contents/Button.qml
index 1413cdb9fa..1413cdb9fa 100644
--- a/examples/declarative/canvas/contents/Button.qml
+++ b/examples/qtquick/canvas/contents/Button.qml
diff --git a/examples/declarative/canvas/contents/ScrollBar.qml b/examples/qtquick/canvas/contents/ScrollBar.qml
index 98b8efee4a..98b8efee4a 100644
--- a/examples/declarative/canvas/contents/ScrollBar.qml
+++ b/examples/qtquick/canvas/contents/ScrollBar.qml
diff --git a/examples/declarative/canvas/contents/Slider.qml b/examples/qtquick/canvas/contents/Slider.qml
index 1050e307f6..1050e307f6 100644
--- a/examples/declarative/canvas/contents/Slider.qml
+++ b/examples/qtquick/canvas/contents/Slider.qml
diff --git a/examples/declarative/canvas/contents/Stocks.qml b/examples/qtquick/canvas/contents/Stocks.qml
index 043bca132e..043bca132e 100644
--- a/examples/declarative/canvas/contents/Stocks.qml
+++ b/examples/qtquick/canvas/contents/Stocks.qml
diff --git a/examples/declarative/canvas/contents/TitleBar.qml b/examples/qtquick/canvas/contents/TitleBar.qml
index 28edda2ae7..28edda2ae7 100644
--- a/examples/declarative/canvas/contents/TitleBar.qml
+++ b/examples/qtquick/canvas/contents/TitleBar.qml
diff --git a/examples/declarative/canvas/contents/ToolBar.qml b/examples/qtquick/canvas/contents/ToolBar.qml
index 7ae7391ddf..7ae7391ddf 100644
--- a/examples/declarative/canvas/contents/ToolBar.qml
+++ b/examples/qtquick/canvas/contents/ToolBar.qml
diff --git a/examples/declarative/canvas/contents/images/button-pressed.png b/examples/qtquick/canvas/contents/images/button-pressed.png
index e434d327f2..e434d327f2 100644
--- a/examples/declarative/canvas/contents/images/button-pressed.png
+++ b/examples/qtquick/canvas/contents/images/button-pressed.png
diff --git a/examples/declarative/canvas/contents/images/button.png b/examples/qtquick/canvas/contents/images/button.png
index 56a63ce641..56a63ce641 100644
--- a/examples/declarative/canvas/contents/images/button.png
+++ b/examples/qtquick/canvas/contents/images/button.png
diff --git a/examples/declarative/canvas/contents/images/default.svg b/examples/qtquick/canvas/contents/images/default.svg
index 248199cc4e..248199cc4e 100644
--- a/examples/declarative/canvas/contents/images/default.svg
+++ b/examples/qtquick/canvas/contents/images/default.svg
diff --git a/examples/declarative/twitter/TwitterCore/images/gloss.png b/examples/qtquick/canvas/contents/images/gloss.png
index 5d370cd93d..5d370cd93d 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/gloss.png
+++ b/examples/qtquick/canvas/contents/images/gloss.png
diff --git a/examples/declarative/twitter/TwitterCore/images/lineedit.png b/examples/qtquick/canvas/contents/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/lineedit.png
+++ b/examples/qtquick/canvas/contents/images/lineedit.png
diff --git a/examples/declarative/twitter/TwitterCore/images/lineedit.sci b/examples/qtquick/canvas/contents/images/lineedit.sci
index 054bff78be..054bff78be 100644
--- a/examples/declarative/twitter/TwitterCore/images/lineedit.sci
+++ b/examples/qtquick/canvas/contents/images/lineedit.sci
diff --git a/examples/declarative/twitter/TwitterCore/images/quit.png b/examples/qtquick/canvas/contents/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/quit.png
+++ b/examples/qtquick/canvas/contents/images/quit.png
diff --git a/examples/declarative/twitter/TwitterCore/images/stripes.png b/examples/qtquick/canvas/contents/images/stripes.png
index 9f36727ea4..9f36727ea4 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/stripes.png
+++ b/examples/qtquick/canvas/contents/images/stripes.png
diff --git a/examples/declarative/twitter/TwitterCore/images/titlebar.png b/examples/qtquick/canvas/contents/images/titlebar.png
index 51c90082d0..51c90082d0 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/titlebar.png
+++ b/examples/qtquick/canvas/contents/images/titlebar.png
diff --git a/examples/declarative/twitter/TwitterCore/images/titlebar.sci b/examples/qtquick/canvas/contents/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100644
--- a/examples/declarative/twitter/TwitterCore/images/titlebar.sci
+++ b/examples/qtquick/canvas/contents/images/titlebar.sci
diff --git a/examples/declarative/twitter/TwitterCore/images/toolbutton.png b/examples/qtquick/canvas/contents/images/toolbutton.png
index 11310013ee..11310013ee 100644..100755
--- a/examples/declarative/twitter/TwitterCore/images/toolbutton.png
+++ b/examples/qtquick/canvas/contents/images/toolbutton.png
diff --git a/examples/declarative/twitter/TwitterCore/images/toolbutton.sci b/examples/qtquick/canvas/contents/images/toolbutton.sci
index 9e4f965307..9e4f965307 100644
--- a/examples/declarative/twitter/TwitterCore/images/toolbutton.sci
+++ b/examples/qtquick/canvas/contents/images/toolbutton.sci
diff --git a/examples/declarative/canvas/contents/qt-logo.png b/examples/qtquick/canvas/contents/qt-logo.png
index 5ab3a1b0c4..5ab3a1b0c4 100644
--- a/examples/declarative/canvas/contents/qt-logo.png
+++ b/examples/qtquick/canvas/contents/qt-logo.png
diff --git a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/qtquick/canvas/quadraticCurveTo/quadraticCurveTo.qml
index bc3ca0071a..bc3ca0071a 100644
--- a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml
+++ b/examples/qtquick/canvas/quadraticCurveTo/quadraticCurveTo.qml
diff --git a/examples/declarative/canvas/roundedrect/roundedrect.qml b/examples/qtquick/canvas/roundedrect/roundedrect.qml
index fd86c63a3b..fd86c63a3b 100644
--- a/examples/declarative/canvas/roundedrect/roundedrect.qml
+++ b/examples/qtquick/canvas/roundedrect/roundedrect.qml
diff --git a/examples/declarative/canvas/smile/smile.qml b/examples/qtquick/canvas/smile/smile.qml
index 28a48a6c81..28a48a6c81 100644
--- a/examples/declarative/canvas/smile/smile.qml
+++ b/examples/qtquick/canvas/smile/smile.qml
diff --git a/examples/declarative/canvas/squircle/squircle.png b/examples/qtquick/canvas/squircle/squircle.png
index 86c69d945f..86c69d945f 100644
--- a/examples/declarative/canvas/squircle/squircle.png
+++ b/examples/qtquick/canvas/squircle/squircle.png
diff --git a/examples/declarative/canvas/squircle/squircle.qml b/examples/qtquick/canvas/squircle/squircle.qml
index 2fc65b67b3..2fc65b67b3 100644
--- a/examples/declarative/canvas/squircle/squircle.qml
+++ b/examples/qtquick/canvas/squircle/squircle.qml
diff --git a/examples/declarative/canvas/stockchart/README b/examples/qtquick/canvas/stockchart/README
index 2652866ed6..2652866ed6 100644
--- a/examples/declarative/canvas/stockchart/README
+++ b/examples/qtquick/canvas/stockchart/README
diff --git a/examples/declarative/canvas/stockchart/com/nokia/StockChartExample/qmldir b/examples/qtquick/canvas/stockchart/com/nokia/StockChartExample/qmldir
index 4c60e556d4..4c60e556d4 100644
--- a/examples/declarative/canvas/stockchart/com/nokia/StockChartExample/qmldir
+++ b/examples/qtquick/canvas/stockchart/com/nokia/StockChartExample/qmldir
diff --git a/examples/declarative/canvas/stockchart/model.cpp b/examples/qtquick/canvas/stockchart/model.cpp
index 42eb2d592f..42eb2d592f 100644
--- a/examples/declarative/canvas/stockchart/model.cpp
+++ b/examples/qtquick/canvas/stockchart/model.cpp
diff --git a/examples/declarative/canvas/stockchart/model.h b/examples/qtquick/canvas/stockchart/model.h
index 95e6f4891c..95e6f4891c 100644
--- a/examples/declarative/canvas/stockchart/model.h
+++ b/examples/qtquick/canvas/stockchart/model.h
diff --git a/examples/declarative/canvas/stockchart/plugin.cpp b/examples/qtquick/canvas/stockchart/plugin.cpp
index af64af4da8..af64af4da8 100644
--- a/examples/declarative/canvas/stockchart/plugin.cpp
+++ b/examples/qtquick/canvas/stockchart/plugin.cpp
diff --git a/examples/declarative/canvas/stockchart/stock.qml b/examples/qtquick/canvas/stockchart/stock.qml
index 1c95fde2ce..1c95fde2ce 100644
--- a/examples/declarative/canvas/stockchart/stock.qml
+++ b/examples/qtquick/canvas/stockchart/stock.qml
diff --git a/examples/declarative/canvas/stockchart/stockchart.pro b/examples/qtquick/canvas/stockchart/stockchart.pro
index 4006b5dccf..4006b5dccf 100644
--- a/examples/declarative/canvas/stockchart/stockchart.pro
+++ b/examples/qtquick/canvas/stockchart/stockchart.pro
diff --git a/examples/declarative/canvas/tiger/tiger.js b/examples/qtquick/canvas/tiger/tiger.js
index 4be0d26c9d..4be0d26c9d 100644
--- a/examples/declarative/canvas/tiger/tiger.js
+++ b/examples/qtquick/canvas/tiger/tiger.js
diff --git a/examples/declarative/canvas/tiger/tiger.qml b/examples/qtquick/canvas/tiger/tiger.qml
index 2eb1bb2106..2eb1bb2106 100644
--- a/examples/declarative/canvas/tiger/tiger.qml
+++ b/examples/qtquick/canvas/tiger/tiger.qml
diff --git a/examples/declarative/canvas/twitterfriends/TwitterUser.qml b/examples/qtquick/canvas/twitterfriends/TwitterUser.qml
index 8b906216ef..8b906216ef 100644
--- a/examples/declarative/canvas/twitterfriends/TwitterUser.qml
+++ b/examples/qtquick/canvas/twitterfriends/TwitterUser.qml
diff --git a/examples/declarative/canvas/twitterfriends/cache.js b/examples/qtquick/canvas/twitterfriends/cache.js
index 6c8a1cd71a..6c8a1cd71a 100644
--- a/examples/declarative/canvas/twitterfriends/cache.js
+++ b/examples/qtquick/canvas/twitterfriends/cache.js
diff --git a/examples/declarative/canvas/twitterfriends/twitter.qml b/examples/qtquick/canvas/twitterfriends/twitter.qml
index 9dc2bcc939..9dc2bcc939 100644
--- a/examples/declarative/canvas/twitterfriends/twitter.qml
+++ b/examples/qtquick/canvas/twitterfriends/twitter.qml
diff --git a/examples/declarative/draganddrop/dragtarget.qmlproject b/examples/qtquick/draganddrop/dragtarget.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/draganddrop/dragtarget.qmlproject
+++ b/examples/qtquick/draganddrop/dragtarget.qmlproject
diff --git a/examples/declarative/draganddrop/tiles/DragTile.qml b/examples/qtquick/draganddrop/tiles/DragTile.qml
index 2813fa8caf..2813fa8caf 100644
--- a/examples/declarative/draganddrop/tiles/DragTile.qml
+++ b/examples/qtquick/draganddrop/tiles/DragTile.qml
diff --git a/examples/declarative/draganddrop/tiles/DropTile.qml b/examples/qtquick/draganddrop/tiles/DropTile.qml
index e8566f04cc..e8566f04cc 100644
--- a/examples/declarative/draganddrop/tiles/DropTile.qml
+++ b/examples/qtquick/draganddrop/tiles/DropTile.qml
diff --git a/examples/declarative/draganddrop/tiles/tiles.qml b/examples/qtquick/draganddrop/tiles/tiles.qml
index 31c87f8244..31c87f8244 100644
--- a/examples/declarative/draganddrop/tiles/tiles.qml
+++ b/examples/qtquick/draganddrop/tiles/tiles.qml
diff --git a/examples/declarative/draganddrop/views/gridview.qml b/examples/qtquick/draganddrop/views/gridview.qml
index 375f3d2824..375f3d2824 100644
--- a/examples/declarative/draganddrop/views/gridview.qml
+++ b/examples/qtquick/draganddrop/views/gridview.qml
diff --git a/examples/qtquick/imageelements/borderimage.qml b/examples/qtquick/imageelements/borderimage.qml
new file mode 100644
index 0000000000..7e132494db
--- /dev/null
+++ b/examples/qtquick/imageelements/borderimage.qml
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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"
+
+Rectangle {
+    id: page
+    width: 320
+    height: 480
+
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 1030
+        contentHeight: 540
+        Grid {
+            anchors.centerIn: parent; spacing: 20
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+                source: "content/colors.png"; margin: 30
+                horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+            }
+
+            MyBorderImage {
+                minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+                source: "content/bw.png"; margin: 10
+                horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+            }
+        }
+    }
+}
diff --git a/examples/declarative/imageelements/content/BearSheet.png b/examples/qtquick/imageelements/content/BearSheet.png
index a084bf0f1e..a084bf0f1e 100644
--- a/examples/declarative/imageelements/content/BearSheet.png
+++ b/examples/qtquick/imageelements/content/BearSheet.png
diff --git a/examples/declarative/imageelements/content/ImageCell.qml b/examples/qtquick/imageelements/content/ImageCell.qml
index fcc6b47af5..fcc6b47af5 100644
--- a/examples/declarative/imageelements/content/ImageCell.qml
+++ b/examples/qtquick/imageelements/content/ImageCell.qml
diff --git a/examples/declarative/imageelements/content/MyBorderImage.qml b/examples/qtquick/imageelements/content/MyBorderImage.qml
index 178e3706db..178e3706db 100644
--- a/examples/declarative/imageelements/content/MyBorderImage.qml
+++ b/examples/qtquick/imageelements/content/MyBorderImage.qml
diff --git a/examples/declarative/imageelements/content/ShadowRectangle.qml b/examples/qtquick/imageelements/content/ShadowRectangle.qml
index e6fd13bb26..e6fd13bb26 100644
--- a/examples/declarative/imageelements/content/ShadowRectangle.qml
+++ b/examples/qtquick/imageelements/content/ShadowRectangle.qml
diff --git a/examples/declarative/imageelements/content/bw.png b/examples/qtquick/imageelements/content/bw.png
index 486eaae96e..486eaae96e 100644
--- a/examples/declarative/imageelements/content/bw.png
+++ b/examples/qtquick/imageelements/content/bw.png
diff --git a/examples/declarative/imageelements/content/colors-round.sci b/examples/qtquick/imageelements/content/colors-round.sci
index 506f6f5f99..506f6f5f99 100644
--- a/examples/declarative/imageelements/content/colors-round.sci
+++ b/examples/qtquick/imageelements/content/colors-round.sci
diff --git a/examples/declarative/imageelements/content/colors-stretch.sci b/examples/qtquick/imageelements/content/colors-stretch.sci
index e4989a723c..e4989a723c 100644
--- a/examples/declarative/imageelements/content/colors-stretch.sci
+++ b/examples/qtquick/imageelements/content/colors-stretch.sci
diff --git a/examples/declarative/imageelements/content/colors.png b/examples/qtquick/imageelements/content/colors.png
index dfb62f3d64..dfb62f3d64 100644
--- a/examples/declarative/imageelements/content/colors.png
+++ b/examples/qtquick/imageelements/content/colors.png
diff --git a/examples/declarative/imageelements/content/qt-logo.png b/examples/qtquick/imageelements/content/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/imageelements/content/qt-logo.png
+++ b/examples/qtquick/imageelements/content/qt-logo.png
diff --git a/examples/declarative/imageelements/content/shadow.png b/examples/qtquick/imageelements/content/shadow.png
index 431af8545d..431af8545d 100644
--- a/examples/declarative/imageelements/content/shadow.png
+++ b/examples/qtquick/imageelements/content/shadow.png
diff --git a/examples/declarative/imageelements/content/speaker.png b/examples/qtquick/imageelements/content/speaker.png
index fb0e857859..fb0e857859 100644
--- a/examples/declarative/imageelements/content/speaker.png
+++ b/examples/qtquick/imageelements/content/speaker.png
diff --git a/examples/qtquick/imageelements/image.qml b/examples/qtquick/imageelements/image.qml
new file mode 100644
index 0000000000..159558995d
--- /dev/null
+++ b/examples/qtquick/imageelements/image.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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"
+
+Rectangle {
+    width: 320
+    height: 480
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 490
+        contentHeight: 285
+
+        Grid {
+            property int cellWidth: (width - (spacing * (columns - 1))) / columns
+            property int cellHeight: (height - (spacing * (rows - 1))) / rows
+
+            anchors.fill: parent
+            anchors.margins: 30
+
+            columns: 3
+            rows: 2
+            spacing: 30
+
+            ImageCell { mode: Image.Stretch; caption: "Stretch" }
+            ImageCell { mode: Image.PreserveAspectFit; caption: "PreserveAspectFit" }
+            ImageCell { mode: Image.PreserveAspectCrop; caption: "PreserveAspectCrop" }
+
+            ImageCell { mode: Image.Tile; caption: "Tile" }
+            ImageCell { mode: Image.TileHorizontally; caption: "TileHorizontally" }
+            ImageCell { mode: Image.TileVertically; caption: "TileVertically" }
+        }
+    }
+}
diff --git a/examples/declarative/imageelements/imageelements.qml b/examples/qtquick/imageelements/imageelements.qml
index 2ef5154968..f4075ec4c3 100644
--- a/examples/declarative/imageelements/imageelements.qml
+++ b/examples/qtquick/imageelements/imageelements.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/qtquick/imageelements/imageelements.qmlproject
index 4292a0c112..4292a0c112 100644
--- a/examples/declarative/imageelements/imageelements.qmlproject
+++ b/examples/qtquick/imageelements/imageelements.qmlproject
diff --git a/examples/declarative/imageelements/shadows.qml b/examples/qtquick/imageelements/shadows.qml
index aa5022ab36..aa5022ab36 100644
--- a/examples/declarative/imageelements/shadows.qml
+++ b/examples/qtquick/imageelements/shadows.qml
diff --git a/examples/declarative/imageelements/simplesprite.qml b/examples/qtquick/imageelements/simplesprite.qml
index f619913bfc..f619913bfc 100644
--- a/examples/declarative/imageelements/simplesprite.qml
+++ b/examples/qtquick/imageelements/simplesprite.qml
diff --git a/examples/declarative/imageelements/spriteimage.qml b/examples/qtquick/imageelements/spriteimage.qml
index 559bb10a50..559bb10a50 100644
--- a/examples/declarative/imageelements/spriteimage.qml
+++ b/examples/qtquick/imageelements/spriteimage.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/qtquick/keyinteraction/focus/Core/ContextMenu.qml
index dc68aa2b30..dc68aa2b30 100644
--- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+++ b/examples/qtquick/keyinteraction/focus/Core/ContextMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/qtquick/keyinteraction/focus/Core/GridMenu.qml
index 75bbe682af..75bbe682af 100644
--- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+++ b/examples/qtquick/keyinteraction/focus/Core/GridMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml b/examples/qtquick/keyinteraction/focus/Core/ListMenu.qml
index 7a62f33428..7a62f33428 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
+++ b/examples/qtquick/keyinteraction/focus/Core/ListMenu.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/qtquick/keyinteraction/focus/Core/ListViewDelegate.qml
index b28b02616d..b28b02616d 100644
--- a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
+++ b/examples/qtquick/keyinteraction/focus/Core/ListViewDelegate.qml
diff --git a/examples/declarative/keyinteraction/focus/Core/images/arrow.png b/examples/qtquick/keyinteraction/focus/Core/images/arrow.png
index 14978c2e56..14978c2e56 100644
--- a/examples/declarative/keyinteraction/focus/Core/images/arrow.png
+++ b/examples/qtquick/keyinteraction/focus/Core/images/arrow.png
diff --git a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png b/examples/qtquick/keyinteraction/focus/Core/images/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
+++ b/examples/qtquick/keyinteraction/focus/Core/images/qt-logo.png
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/qtquick/keyinteraction/focus/focus.qml
index 9300ad4f6e..9300ad4f6e 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/qtquick/keyinteraction/focus/focus.qml
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.pro
index eaf2b30c89..eaf2b30c89 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.pro
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.qrc
index 4ae861cb3d..4ae861cb3d 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ b/examples/qtquick/modelviews/abstractitemmodel/abstractitemmodel.qrc
diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/qtquick/modelviews/abstractitemmodel/main.cpp
index b6ca2df26e..b6ca2df26e 100644
--- a/examples/declarative/modelviews/abstractitemmodel/main.cpp
+++ b/examples/qtquick/modelviews/abstractitemmodel/main.cpp
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.cpp b/examples/qtquick/modelviews/abstractitemmodel/model.cpp
index 8f7649c0d4..8f7649c0d4 100644
--- a/examples/declarative/modelviews/abstractitemmodel/model.cpp
+++ b/examples/qtquick/modelviews/abstractitemmodel/model.cpp
diff --git a/examples/declarative/modelviews/abstractitemmodel/model.h b/examples/qtquick/modelviews/abstractitemmodel/model.h
index 1378c4487e..1378c4487e 100644
--- a/examples/declarative/modelviews/abstractitemmodel/model.h
+++ b/examples/qtquick/modelviews/abstractitemmodel/model.h
diff --git a/examples/declarative/modelviews/abstractitemmodel/view.qml b/examples/qtquick/modelviews/abstractitemmodel/view.qml
index 64f5871d4b..64f5871d4b 100644
--- a/examples/declarative/modelviews/abstractitemmodel/view.qml
+++ b/examples/qtquick/modelviews/abstractitemmodel/view.qml
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/qtquick/modelviews/gridview/gridview-example.qml
index ea3bb5cec9..ea3bb5cec9 100644
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ b/examples/qtquick/modelviews/gridview/gridview-example.qml
diff --git a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png b/examples/qtquick/modelviews/gridview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png b/examples/qtquick/modelviews/gridview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/Camera_48.png b/examples/qtquick/modelviews/gridview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/gridview/pics/Camera_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/DateBook_48.png b/examples/qtquick/modelviews/gridview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/gridview/pics/DateBook_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/EMail_48.png b/examples/qtquick/modelviews/gridview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/gridview/pics/EMail_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/TodoList_48.png b/examples/qtquick/modelviews/gridview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/gridview/pics/TodoList_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png b/examples/qtquick/modelviews/gridview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png
+++ b/examples/qtquick/modelviews/gridview/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/listview/content/PetsModel.qml b/examples/qtquick/modelviews/listview/content/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/modelviews/listview/content/PetsModel.qml
+++ b/examples/qtquick/modelviews/listview/content/PetsModel.qml
diff --git a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml b/examples/qtquick/modelviews/listview/content/PressAndHoldButton.qml
index b20d8f64f1..b20d8f64f1 100644
--- a/examples/declarative/modelviews/listview/content/PressAndHoldButton.qml
+++ b/examples/qtquick/modelviews/listview/content/PressAndHoldButton.qml
diff --git a/examples/declarative/modelviews/listview/content/RecipesModel.qml b/examples/qtquick/modelviews/listview/content/RecipesModel.qml
index 86210ba436..86210ba436 100644
--- a/examples/declarative/modelviews/listview/content/RecipesModel.qml
+++ b/examples/qtquick/modelviews/listview/content/RecipesModel.qml
diff --git a/examples/declarative/modelviews/listview/content/TextButton.qml b/examples/qtquick/modelviews/listview/content/TextButton.qml
index 980ee21553..980ee21553 100644
--- a/examples/declarative/modelviews/listview/content/TextButton.qml
+++ b/examples/qtquick/modelviews/listview/content/TextButton.qml
diff --git a/examples/declarative/modelviews/listview/content/ToggleButton.qml b/examples/qtquick/modelviews/listview/content/ToggleButton.qml
index 0754d9849b..0754d9849b 100644
--- a/examples/declarative/modelviews/listview/content/ToggleButton.qml
+++ b/examples/qtquick/modelviews/listview/content/ToggleButton.qml
diff --git a/examples/declarative/modelviews/listview/content/pics/arrow-down.png b/examples/qtquick/modelviews/listview/content/pics/arrow-down.png
index 29d1d4439a..29d1d4439a 100644
--- a/examples/declarative/modelviews/listview/content/pics/arrow-down.png
+++ b/examples/qtquick/modelviews/listview/content/pics/arrow-down.png
diff --git a/examples/declarative/modelviews/listview/content/pics/arrow-up.png b/examples/qtquick/modelviews/listview/content/pics/arrow-up.png
index e437312217..e437312217 100644
--- a/examples/declarative/modelviews/listview/content/pics/arrow-up.png
+++ b/examples/qtquick/modelviews/listview/content/pics/arrow-up.png
diff --git a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg b/examples/qtquick/modelviews/listview/content/pics/fruit-salad.jpg
index da5a6b10a2..da5a6b10a2 100644
--- a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg
+++ b/examples/qtquick/modelviews/listview/content/pics/fruit-salad.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg b/examples/qtquick/modelviews/listview/content/pics/hamburger.jpg
index d0a15be1bf..d0a15be1bf 100644
--- a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg
+++ b/examples/qtquick/modelviews/listview/content/pics/hamburger.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg b/examples/qtquick/modelviews/listview/content/pics/lemonade.jpg
index db445c9ac8..db445c9ac8 100644
--- a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg
+++ b/examples/qtquick/modelviews/listview/content/pics/lemonade.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/list-delete.png b/examples/qtquick/modelviews/listview/content/pics/list-delete.png
index df2a147d24..df2a147d24 100644
--- a/examples/declarative/modelviews/listview/content/pics/list-delete.png
+++ b/examples/qtquick/modelviews/listview/content/pics/list-delete.png
diff --git a/examples/declarative/modelviews/listview/content/pics/minus-sign.png b/examples/qtquick/modelviews/listview/content/pics/minus-sign.png
index d6f233d739..d6f233d739 100644
--- a/examples/declarative/modelviews/listview/content/pics/minus-sign.png
+++ b/examples/qtquick/modelviews/listview/content/pics/minus-sign.png
diff --git a/examples/declarative/modelviews/listview/content/pics/moreDown.png b/examples/qtquick/modelviews/listview/content/pics/moreDown.png
index 31a35d5c20..31a35d5c20 100644
--- a/examples/declarative/modelviews/listview/content/pics/moreDown.png
+++ b/examples/qtquick/modelviews/listview/content/pics/moreDown.png
diff --git a/examples/declarative/modelviews/listview/content/pics/moreUp.png b/examples/qtquick/modelviews/listview/content/pics/moreUp.png
index fefb9c9098..fefb9c9098 100644
--- a/examples/declarative/modelviews/listview/content/pics/moreUp.png
+++ b/examples/qtquick/modelviews/listview/content/pics/moreUp.png
diff --git a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg b/examples/qtquick/modelviews/listview/content/pics/pancakes.jpg
index 60c439638e..60c439638e 100644
--- a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg
+++ b/examples/qtquick/modelviews/listview/content/pics/pancakes.jpg
diff --git a/examples/declarative/modelviews/listview/content/pics/plus-sign.png b/examples/qtquick/modelviews/listview/content/pics/plus-sign.png
index 40df1134f8..40df1134f8 100644
--- a/examples/declarative/modelviews/listview/content/pics/plus-sign.png
+++ b/examples/qtquick/modelviews/listview/content/pics/plus-sign.png
diff --git a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/qtquick/modelviews/listview/content/pics/vegetable-soup.jpg
index 9dce332041..9dce332041 100644
--- a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg
+++ b/examples/qtquick/modelviews/listview/content/pics/vegetable-soup.jpg
diff --git a/examples/declarative/modelviews/listview/dynamiclist.qml b/examples/qtquick/modelviews/listview/dynamiclist.qml
index ee7c6329bc..ee7c6329bc 100644
--- a/examples/declarative/modelviews/listview/dynamiclist.qml
+++ b/examples/qtquick/modelviews/listview/dynamiclist.qml
diff --git a/examples/declarative/modelviews/listview/expandingdelegates.qml b/examples/qtquick/modelviews/listview/expandingdelegates.qml
index 43a9662422..43a9662422 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates.qml
+++ b/examples/qtquick/modelviews/listview/expandingdelegates.qml
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/qtquick/modelviews/listview/highlight.qml
index d8f76080e6..d8f76080e6 100644
--- a/examples/declarative/modelviews/listview/highlight.qml
+++ b/examples/qtquick/modelviews/listview/highlight.qml
diff --git a/examples/declarative/modelviews/listview/highlightranges.qml b/examples/qtquick/modelviews/listview/highlightranges.qml
index a536ddcbb2..a536ddcbb2 100644
--- a/examples/declarative/modelviews/listview/highlightranges.qml
+++ b/examples/qtquick/modelviews/listview/highlightranges.qml
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/qtquick/modelviews/listview/sections.qml
index 2e63a86bb6..2e63a86bb6 100644
--- a/examples/declarative/modelviews/listview/sections.qml
+++ b/examples/qtquick/modelviews/listview/sections.qml
diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/qtquick/modelviews/modelviews.pro
index 7748da0471..7748da0471 100644
--- a/examples/declarative/modelviews/modelviews.pro
+++ b/examples/qtquick/modelviews/modelviews.pro
diff --git a/examples/declarative/modelviews/modelviews.qml b/examples/qtquick/modelviews/modelviews.qml
index 86b10ca4ba..f11608bcc7 100644
--- a/examples/declarative/modelviews/modelviews.qml
+++ b/examples/qtquick/modelviews/modelviews.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
diff --git a/examples/declarative/modelviews/modelviews.qmlproject b/examples/qtquick/modelviews/modelviews.qmlproject
index 40f9e568fd..40f9e568fd 100644
--- a/examples/declarative/modelviews/modelviews.qmlproject
+++ b/examples/qtquick/modelviews/modelviews.qmlproject
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.cpp b/examples/qtquick/modelviews/objectlistmodel/dataobject.cpp
index 7216283616..7216283616 100644
--- a/examples/declarative/modelviews/objectlistmodel/dataobject.cpp
+++ b/examples/qtquick/modelviews/objectlistmodel/dataobject.cpp
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.h b/examples/qtquick/modelviews/objectlistmodel/dataobject.h
index bea92a273c..bea92a273c 100644
--- a/examples/declarative/modelviews/objectlistmodel/dataobject.h
+++ b/examples/qtquick/modelviews/objectlistmodel/dataobject.h
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/qtquick/modelviews/objectlistmodel/main.cpp
index c8542976c3..c8542976c3 100644
--- a/examples/declarative/modelviews/objectlistmodel/main.cpp
+++ b/examples/qtquick/modelviews/objectlistmodel/main.cpp
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.pro
index 74dc5b1016..74dc5b1016 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.pro
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject
+++ b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qmlproject
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
+++ b/examples/qtquick/modelviews/objectlistmodel/objectlistmodel.qrc
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/qtquick/modelviews/objectlistmodel/view.qml
index 3954e79829..3954e79829 100644
--- a/examples/declarative/modelviews/objectlistmodel/view.qml
+++ b/examples/qtquick/modelviews/objectlistmodel/view.qml
diff --git a/examples/declarative/particles/itemparticle/content/Delegate.qml b/examples/qtquick/modelviews/package/Delegate.qml
index 97c7840cb4..97c7840cb4 100644
--- a/examples/declarative/particles/itemparticle/content/Delegate.qml
+++ b/examples/qtquick/modelviews/package/Delegate.qml
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/qtquick/modelviews/package/view.qml
index 5b2fd9481c..7ba6664ae2 100644
--- a/examples/declarative/modelviews/package/view.qml
+++ b/examples/qtquick/modelviews/package/view.qml
@@ -73,4 +73,8 @@ Rectangle {
         model: visualModel.parts.grid
     }
     //![0]
+    Text {
+        anchors.bottom: parent.bottom
+        text: "Tap a delegate to move between views"
+    }
 }
diff --git a/examples/qtquick/modelviews/parallax/content/Clock.qml b/examples/qtquick/modelviews/parallax/content/Clock.qml
new file mode 100644
index 0000000000..7f0e8cba83
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/Clock.qml
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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
+
+Item {
+    id : clock
+    width: {
+        if (ListView.view && ListView.view.width >= 200)
+            return ListView.view.width / Math.floor(ListView.view.width / 200.0);
+        else
+            return 200;
+    }
+
+    height: {
+        if (ListView.view && ListView.view.height >= 240)
+            return ListView.view.height;
+        else
+            return 240;
+    }
+
+    property alias city: cityLabel.text
+    property int hours
+    property int minutes
+    property int seconds
+    property real shift
+    property bool night: false
+    property bool internationalTime: true //Unset for local time
+
+    function timeChanged() {
+        var date = new Date;
+        hours = internationalTime ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours()
+        night = ( hours < 7 || hours > 19 )
+        minutes = internationalTime ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes()
+        seconds = date.getUTCSeconds();
+    }
+
+    Timer {
+        interval: 100; running: true; repeat: true;
+        onTriggered: clock.timeChanged()
+    }
+
+    Item {
+        anchors.centerIn: parent
+        width: 200; height: 240
+
+        Image { id: background; source: "clock.png"; visible: clock.night == false }
+        Image { source: "clock-night.png"; visible: clock.night == true }
+
+
+        Image {
+            x: 92.5; y: 27
+            source: "hour.png"
+            smooth: true
+            transform: Rotation {
+                id: hourRotation
+                origin.x: 7.5; origin.y: 73;
+                angle: (clock.hours * 30) + (clock.minutes * 0.5)
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            x: 93.5; y: 17
+            source: "minute.png"
+            smooth: true
+            transform: Rotation {
+                id: minuteRotation
+                origin.x: 6.5; origin.y: 83;
+                angle: clock.minutes * 6
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            x: 97.5; y: 20
+            source: "second.png"
+            smooth: true
+            transform: Rotation {
+                id: secondRotation
+                origin.x: 2.5; origin.y: 80;
+                angle: clock.seconds * 6
+                Behavior on angle {
+                    SpringAnimation { spring: 2; damping: 0.2; modulus: 360 }
+                }
+            }
+        }
+
+        Image {
+            anchors.centerIn: background; source: "center.png"
+        }
+
+        Text {
+            id: cityLabel
+            y: 210; anchors.horizontalCenter: parent.horizontalCenter
+            color: "white"
+            font.family: "Helvetica"
+            font.bold: true; font.pixelSize: 16
+            style: Text.Raised; styleColor: "black"
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/parallax/content/ParallaxView.qml b/examples/qtquick/modelviews/parallax/content/ParallaxView.qml
index 2acf50dcef..2acf50dcef 100644
--- a/examples/declarative/modelviews/parallax/content/ParallaxView.qml
+++ b/examples/qtquick/modelviews/parallax/content/ParallaxView.qml
diff --git a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml b/examples/qtquick/modelviews/parallax/content/QuitButton.qml
index 702b892d23..702b892d23 100644
--- a/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml
+++ b/examples/qtquick/modelviews/parallax/content/QuitButton.qml
diff --git a/examples/declarative/modelviews/parallax/content/Smiley.qml b/examples/qtquick/modelviews/parallax/content/Smiley.qml
index 982b6c5d2b..982b6c5d2b 100644
--- a/examples/declarative/modelviews/parallax/content/Smiley.qml
+++ b/examples/qtquick/modelviews/parallax/content/Smiley.qml
diff --git a/examples/qtquick/modelviews/parallax/content/background.png b/examples/qtquick/modelviews/parallax/content/background.png
new file mode 100644
index 0000000000..a885950862
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/background.png
diff --git a/examples/qtquick/modelviews/parallax/content/center.png b/examples/qtquick/modelviews/parallax/content/center.png
new file mode 100644
index 0000000000..7fbd802a44
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/center.png
diff --git a/examples/qtquick/modelviews/parallax/content/clock-night.png b/examples/qtquick/modelviews/parallax/content/clock-night.png
new file mode 100644
index 0000000000..cc7151a397
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/clock-night.png
diff --git a/examples/qtquick/modelviews/parallax/content/clock.png b/examples/qtquick/modelviews/parallax/content/clock.png
new file mode 100644
index 0000000000..462edacc0e
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/clock.png
diff --git a/examples/qtquick/modelviews/parallax/content/hour.png b/examples/qtquick/modelviews/parallax/content/hour.png
new file mode 100644
index 0000000000..f8061a1235
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/hour.png
diff --git a/examples/qtquick/modelviews/parallax/content/minute.png b/examples/qtquick/modelviews/parallax/content/minute.png
new file mode 100644
index 0000000000..1297ec7c2b
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/minute.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/background.jpg b/examples/qtquick/modelviews/parallax/content/pics/background.jpg
index 61cca2f138..61cca2f138 100644
--- a/examples/declarative/modelviews/parallax/content/pics/background.jpg
+++ b/examples/qtquick/modelviews/parallax/content/pics/background.jpg
diff --git a/examples/declarative/shadereffects/content/face-smile.png b/examples/qtquick/modelviews/parallax/content/pics/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/shadereffects/content/face-smile.png
+++ b/examples/qtquick/modelviews/parallax/content/pics/face-smile.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/home-page.png b/examples/qtquick/modelviews/parallax/content/pics/home-page.png
index bd090c3708..bd090c3708 100644
--- a/examples/declarative/modelviews/parallax/content/pics/home-page.png
+++ b/examples/qtquick/modelviews/parallax/content/pics/home-page.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/home-page.svg b/examples/qtquick/modelviews/parallax/content/pics/home-page.svg
index 4f16958844..4f16958844 100644
--- a/examples/declarative/modelviews/parallax/content/pics/home-page.svg
+++ b/examples/qtquick/modelviews/parallax/content/pics/home-page.svg
diff --git a/examples/declarative/modelviews/parallax/content/pics/shadow.png b/examples/qtquick/modelviews/parallax/content/pics/shadow.png
index 8270565e87..8270565e87 100644
--- a/examples/declarative/modelviews/parallax/content/pics/shadow.png
+++ b/examples/qtquick/modelviews/parallax/content/pics/shadow.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/yast-joystick.png b/examples/qtquick/modelviews/parallax/content/pics/yast-joystick.png
index 858cea0301..858cea0301 100644
--- a/examples/declarative/modelviews/parallax/content/pics/yast-joystick.png
+++ b/examples/qtquick/modelviews/parallax/content/pics/yast-joystick.png
diff --git a/examples/declarative/modelviews/parallax/content/pics/yast-wol.png b/examples/qtquick/modelviews/parallax/content/pics/yast-wol.png
index 7712180a3b..7712180a3b 100644
--- a/examples/declarative/modelviews/parallax/content/pics/yast-wol.png
+++ b/examples/qtquick/modelviews/parallax/content/pics/yast-wol.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/quit.png b/examples/qtquick/modelviews/parallax/content/quit.png
index b822057d4e..b822057d4e 100644
--- a/examples/declarative/ui-components/dialcontrol/content/quit.png
+++ b/examples/qtquick/modelviews/parallax/content/quit.png
diff --git a/examples/qtquick/modelviews/parallax/content/second.png b/examples/qtquick/modelviews/parallax/content/second.png
new file mode 100644
index 0000000000..4aa9fb5e8e
--- /dev/null
+++ b/examples/qtquick/modelviews/parallax/content/second.png
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/qtquick/modelviews/parallax/parallax.qml
index 6981095a80..30578e510e 100644
--- a/examples/declarative/modelviews/parallax/parallax.qml
+++ b/examples/qtquick/modelviews/parallax/parallax.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../toys/clocks/content"  // for loading the Clock element
 import "content"
 
 Rectangle {
diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/qtquick/modelviews/pathview/pathview-example.qml
index 6161343830..6161343830 100644
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ b/examples/qtquick/modelviews/pathview/pathview-example.qml
diff --git a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png b/examples/qtquick/modelviews/pathview/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png b/examples/qtquick/modelviews/pathview/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/Camera_48.png b/examples/qtquick/modelviews/pathview/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/pathview/pics/Camera_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/DateBook_48.png b/examples/qtquick/modelviews/pathview/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/pathview/pics/DateBook_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/EMail_48.png b/examples/qtquick/modelviews/pathview/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/pathview/pics/EMail_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/TodoList_48.png b/examples/qtquick/modelviews/pathview/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/pathview/pics/TodoList_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png b/examples/qtquick/modelviews/pathview/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png
+++ b/examples/qtquick/modelviews/pathview/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/qtquick/modelviews/stringlistmodel/main.cpp
index 47d7fdaa8c..47d7fdaa8c 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/qtquick/modelviews/stringlistmodel/main.cpp
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/qtquick/modelviews/stringlistmodel/stringlistmodel.pro
index 540d8c71f0..540d8c71f0 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/qtquick/modelviews/stringlistmodel/stringlistmodel.pro
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/qtquick/modelviews/stringlistmodel/stringlistmodel.qrc
index 17e9301471..17e9301471 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
+++ b/examples/qtquick/modelviews/stringlistmodel/stringlistmodel.qrc
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/qtquick/modelviews/stringlistmodel/view.qml
index 945763c295..945763c295 100644
--- a/examples/declarative/modelviews/stringlistmodel/view.qml
+++ b/examples/qtquick/modelviews/stringlistmodel/view.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/dragselection.qml b/examples/qtquick/modelviews/visualdatamodel/dragselection.qml
index c3186a5ad8..c3186a5ad8 100644
--- a/examples/declarative/modelviews/visualdatamodel/dragselection.qml
+++ b/examples/qtquick/modelviews/visualdatamodel/dragselection.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/slideshow.qml b/examples/qtquick/modelviews/visualdatamodel/slideshow.qml
index 040c6be307..040c6be307 100644
--- a/examples/declarative/modelviews/visualdatamodel/slideshow.qml
+++ b/examples/qtquick/modelviews/visualdatamodel/slideshow.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/sortedmodel.qml b/examples/qtquick/modelviews/visualdatamodel/sortedmodel.qml
index 8d3b0a58e5..8d3b0a58e5 100644
--- a/examples/declarative/modelviews/visualdatamodel/sortedmodel.qml
+++ b/examples/qtquick/modelviews/visualdatamodel/sortedmodel.qml
diff --git a/examples/declarative/modelviews/visualdatamodel/visualdatamodel.qmlproject b/examples/qtquick/modelviews/visualdatamodel/visualdatamodel.qmlproject
index 2bb4016996..2bb4016996 100644
--- a/examples/declarative/modelviews/visualdatamodel/visualdatamodel.qmlproject
+++ b/examples/qtquick/modelviews/visualdatamodel/visualdatamodel.qmlproject
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml b/examples/qtquick/modelviews/visualitemmodel/visualitemmodel.qml
index 3425150d9a..2e012adec6 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qml
+++ b/examples/qtquick/modelviews/visualitemmodel/visualitemmodel.qml
@@ -44,9 +44,10 @@
 import QtQuick 2.0
 
 Rectangle {
+    id: root
     color: "lightgray"
-    width: 240
-    height: 320
+    width: 320
+    height: 480
     property bool printDestruction: false
 
     VisualItemModel {
@@ -87,7 +88,7 @@ Rectangle {
     }
 
     Rectangle {
-        width: 240; height: 30
+        width: root.width; height: 30
         anchors { top: view.bottom; bottom: parent.bottom }
         color: "gray"
 
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml b/examples/qtquick/mousearea/mousearea-example.qml
index 30e3e62864..30e3e62864 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
+++ b/examples/qtquick/mousearea/mousearea-example.qml
diff --git a/examples/declarative/openglunderqml/main.cpp b/examples/qtquick/openglunderqml/main.cpp
index 3b682deaec..3b682deaec 100644
--- a/examples/declarative/openglunderqml/main.cpp
+++ b/examples/qtquick/openglunderqml/main.cpp
diff --git a/examples/declarative/openglunderqml/main.qml b/examples/qtquick/openglunderqml/main.qml
index 1485cbbdb8..1485cbbdb8 100644
--- a/examples/declarative/openglunderqml/main.qml
+++ b/examples/qtquick/openglunderqml/main.qml
diff --git a/examples/declarative/openglunderqml/openglunderqml.pro b/examples/qtquick/openglunderqml/openglunderqml.pro
index 117ad0c33e..117ad0c33e 100644
--- a/examples/declarative/openglunderqml/openglunderqml.pro
+++ b/examples/qtquick/openglunderqml/openglunderqml.pro
diff --git a/examples/declarative/openglunderqml/squircle.cpp b/examples/qtquick/openglunderqml/squircle.cpp
index b56f0baaf6..b56f0baaf6 100644
--- a/examples/declarative/openglunderqml/squircle.cpp
+++ b/examples/qtquick/openglunderqml/squircle.cpp
diff --git a/examples/declarative/openglunderqml/squircle.h b/examples/qtquick/openglunderqml/squircle.h
index 283131a662..283131a662 100644
--- a/examples/declarative/openglunderqml/squircle.h
+++ b/examples/qtquick/openglunderqml/squircle.h
diff --git a/examples/declarative/painteditem/painteditem.pro b/examples/qtquick/painteditem/painteditem.pro
index e3afd6b0f0..e3afd6b0f0 100644
--- a/examples/declarative/painteditem/painteditem.pro
+++ b/examples/qtquick/painteditem/painteditem.pro
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/qtquick/painteditem/smile/main.cpp
index 1e6b42351d..1e6b42351d 100644
--- a/examples/declarative/painteditem/smile/main.cpp
+++ b/examples/qtquick/painteditem/smile/main.cpp
diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/qtquick/painteditem/smile/smile.pro
index 780d351fe6..780d351fe6 100644
--- a/examples/declarative/painteditem/smile/smile.pro
+++ b/examples/qtquick/painteditem/smile/smile.pro
diff --git a/examples/declarative/painteditem/smile/smile.qml b/examples/qtquick/painteditem/smile/smile.qml
index 33919bc04f..33919bc04f 100644
--- a/examples/declarative/painteditem/smile/smile.qml
+++ b/examples/qtquick/painteditem/smile/smile.qml
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h b/examples/qtquick/painteditem/textballoons/TextBalloonPlugin/plugin.h
index f444d31f4e..f444d31f4e 100644
--- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
+++ b/examples/qtquick/painteditem/textballoons/TextBalloonPlugin/plugin.h
diff --git a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir b/examples/qtquick/painteditem/textballoons/TextBalloonPlugin/qmldir
index e8a08ae9d3..e8a08ae9d3 100644
--- a/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir
+++ b/examples/qtquick/painteditem/textballoons/TextBalloonPlugin/qmldir
diff --git a/examples/declarative/painteditem/textballoons/textballoon.cpp b/examples/qtquick/painteditem/textballoons/textballoon.cpp
index d097adfe1b..d097adfe1b 100644
--- a/examples/declarative/painteditem/textballoons/textballoon.cpp
+++ b/examples/qtquick/painteditem/textballoons/textballoon.cpp
diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/qtquick/painteditem/textballoons/textballoon.h
index 93ed0a7105..93ed0a7105 100644
--- a/examples/declarative/painteditem/textballoons/textballoon.h
+++ b/examples/qtquick/painteditem/textballoons/textballoon.h
diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/qtquick/painteditem/textballoons/textballoons.pro
index e0b9404f65..e0b9404f65 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.pro
+++ b/examples/qtquick/painteditem/textballoons/textballoons.pro
diff --git a/examples/declarative/painteditem/textballoons/textballoons.qml b/examples/qtquick/painteditem/textballoons/textballoons.qml
index b00ce2bfed..b00ce2bfed 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.qml
+++ b/examples/qtquick/painteditem/textballoons/textballoons.qml
diff --git a/examples/declarative/positioners/content/Button.qml b/examples/qtquick/positioners/content/Button.qml
index ee3aa9057e..ee3aa9057e 100644
--- a/examples/declarative/positioners/content/Button.qml
+++ b/examples/qtquick/positioners/content/Button.qml
diff --git a/examples/declarative/positioners/content/add.png b/examples/qtquick/positioners/content/add.png
index 1ee45423e3..1ee45423e3 100644
--- a/examples/declarative/positioners/content/add.png
+++ b/examples/qtquick/positioners/content/add.png
diff --git a/examples/declarative/positioners/content/del.png b/examples/qtquick/positioners/content/del.png
index 8d2eaed523..8d2eaed523 100644
--- a/examples/declarative/positioners/content/del.png
+++ b/examples/qtquick/positioners/content/del.png
diff --git a/examples/declarative/positioners/positioners-attachedproperties.qml b/examples/qtquick/positioners/positioners-attachedproperties.qml
index a05927f5ea..a05927f5ea 100644
--- a/examples/declarative/positioners/positioners-attachedproperties.qml
+++ b/examples/qtquick/positioners/positioners-attachedproperties.qml
diff --git a/examples/declarative/positioners/positioners.qml b/examples/qtquick/positioners/positioners.qml
index d9d16649ff..6627ad7dd4 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/qtquick/positioners/positioners.qml
@@ -43,7 +43,10 @@ import "content"
 
 Rectangle {
     id: page
-    width: 420; height: 420
+    width: 320; height: 480
+    Flickable {
+        anchors.fill: parent
+    contentWidth: 420; contentHeight: 420
 
     Column {
         id: layout1
@@ -261,4 +264,5 @@ Rectangle {
         Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
     }
 
+    }
 }
diff --git a/examples/qtquick/qtquick.pro b/examples/qtquick/qtquick.pro
new file mode 100644
index 0000000000..2ffc377f32
--- /dev/null
+++ b/examples/qtquick/qtquick.pro
@@ -0,0 +1,17 @@
+TEMPLATE = subdirs
+SUBDIRS = accessibility \
+            animation
+            #canvas \
+            #draganddrop \
+            #imageelements \
+            #keyinteraction \
+            #modelviews \
+            #mousearea \
+            #openglunderqml \
+            #painteditem \
+            #positioners \
+            #righttoleft \
+            #shadereffects \
+            #text \
+            #threading \
+            #touchinteraction
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml b/examples/qtquick/righttoleft/layoutdirection/layoutdirection.qml
index 0c65647d5b..0c65647d5b 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
+++ b/examples/qtquick/righttoleft/layoutdirection/layoutdirection.qml
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject b/examples/qtquick/righttoleft/layoutdirection/layoutdirection.qmlproject
index 33cbb3c9e2..33cbb3c9e2 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qmlproject
+++ b/examples/qtquick/righttoleft/layoutdirection/layoutdirection.qmlproject
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml b/examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qml
index 5c4739bd57..5c4739bd57 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml
+++ b/examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qml
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject b/examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qmlproject
index 72bc04a8a9..72bc04a8a9 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qmlproject
+++ b/examples/qtquick/righttoleft/layoutmirroring/layoutmirroring.qmlproject
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qml b/examples/qtquick/righttoleft/textalignment/textalignment.qml
index ef5b97bb1a..ef5b97bb1a 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.qml
+++ b/examples/qtquick/righttoleft/textalignment/textalignment.qml
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject b/examples/qtquick/righttoleft/textalignment/textalignment.qmlproject
index e4b5061364..e4b5061364 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.qmlproject
+++ b/examples/qtquick/righttoleft/textalignment/textalignment.qmlproject
diff --git a/examples/declarative/shadereffects/content/Slider.qml b/examples/qtquick/shadereffects/content/Slider.qml
index 4ddc6d3432..4ddc6d3432 100644
--- a/examples/declarative/shadereffects/content/Slider.qml
+++ b/examples/qtquick/shadereffects/content/Slider.qml
diff --git a/examples/declarative/toys/dynamicscene/content/images/face-smile.png b/examples/qtquick/shadereffects/content/face-smile.png
index 3d66d72578..3d66d72578 100644
--- a/examples/declarative/toys/dynamicscene/content/images/face-smile.png
+++ b/examples/qtquick/shadereffects/content/face-smile.png
diff --git a/examples/declarative/shadereffects/content/qt-logo.png b/examples/qtquick/shadereffects/content/qt-logo.png
index 7d3e97eb36..7d3e97eb36 100644
--- a/examples/declarative/shadereffects/content/qt-logo.png
+++ b/examples/qtquick/shadereffects/content/qt-logo.png
diff --git a/examples/qtquick/shadereffects/shadereffects.qml b/examples/qtquick/shadereffects/shadereffects.qml
new file mode 100644
index 0000000000..70bcf1352a
--- /dev/null
+++ b/examples/qtquick/shadereffects/shadereffects.qml
@@ -0,0 +1,315 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the Declarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "content"
+
+Image {
+    width: 320
+    height: 480
+/*!
+    \title QML Examples - Shader Effects
+    \example declarative/shadereffects
+    \image qml-shadereffects-example.png
+    \brief This is a shader effects example
+
+    This example demonstrates a couple of visual effects that you can perform
+    with shaders in QtQuick 2.0
+*/
+    source: "../snake/content/pics/background.png"
+
+    Flickable {
+        anchors.fill: parent
+        contentWidth: 640
+        contentHeight: 360
+
+        ShaderEffectSource {
+            id: theSource
+            sourceItem: theItem
+            smooth: true
+        }
+
+        function saturate(x) {
+            return Math.min(Math.max(x, 0), 1)
+        }
+
+        function sliderToColor(x) {
+            return Qt.rgba(saturate(Math.max(2 - 6 * x, 6 * x - 4)),
+                            saturate(Math.min(6 * x, 4 - 6 * x)),
+                            saturate(Math.min(6 * x - 2, 6 - 6 * x)))
+        }
+
+        Grid {
+            anchors.centerIn: parent
+            columns: 3
+
+            Item {
+                id: theItem
+                width: 180
+                height: 180
+                ListView {
+                    anchors.centerIn: parent
+                    width: 160
+                    height: 140
+                    clip: true
+                    snapMode: ListView.SnapOneItem
+                    model: VisualItemModel {
+                        Text {
+                            width: 160
+                            height: 140
+                            horizontalAlignment: Text.AlignHCenter
+                            verticalAlignment: Text.AlignVCenter
+                            font.pixelSize: 120
+                            font.family: "Times"
+                            color: "blue"
+                            text: "Qt"
+                        }
+                        Image {
+                            width: 160
+                            height: 140
+                            source: "content/qt-logo.png"
+                            smooth: true
+                        }
+                        Image {
+                            width: 160
+                            height: 140
+                            source: "content/face-smile.png"
+                            smooth: true
+                        }
+                    }
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property real amplitude: 0.04 * wobbleSlider.value
+                property real frequency: 20
+                property real time: 0
+                NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+                fragmentShader:
+                    "uniform lowp float qt_Opacity;" +
+                    "uniform highp float amplitude;" +
+                    "uniform highp float frequency;" +
+                    "uniform highp float time;" +
+                    "uniform sampler2D source;" +
+                    "varying highp vec2 qt_TexCoord0;" +
+                    "void main() {" +
+                    "    highp vec2 p = sin(time + frequency * qt_TexCoord0);" +
+                    "    gl_FragColor = texture2D(source, qt_TexCoord0 + amplitude * vec2(p.y, -p.x)) * qt_Opacity;" +
+                    "}"
+                Slider {
+                    id: wobbleSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property variant shadow: ShaderEffectSource {
+                    smooth: true
+                    sourceItem: ShaderEffect {
+                        width: theItem.width
+                        height: theItem.height
+                        property variant delta: Qt.size(0.0, 1.0 / height)
+                        property variant source: ShaderEffectSource {
+                            smooth: true
+                            sourceItem: ShaderEffect {
+                                width: theItem.width
+                                height: theItem.height
+                                property variant delta: Qt.size(1.0 / width, 0.0)
+                                property variant source: theSource
+                                fragmentShader: "
+                                    uniform lowp float qt_Opacity;
+                                    uniform sampler2D source;
+                                    uniform highp vec2 delta;
+                                    varying highp vec2 qt_TexCoord0;
+                                    void main() {
+                                        gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
+                                                     + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
+                                                     + 0.2466 * texture2D(source, qt_TexCoord0)
+                                                     + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
+                                                     + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
+                                    }"
+                            }
+                        }
+                        fragmentShader: "
+                            uniform lowp float qt_Opacity;
+                            uniform sampler2D source;
+                            uniform highp vec2 delta;
+                            varying highp vec2 qt_TexCoord0;
+                            void main() {
+                                gl_FragColor =(0.0538 * texture2D(source, qt_TexCoord0 - 3.182 * delta)
+                                             + 0.3229 * texture2D(source, qt_TexCoord0 - 1.364 * delta)
+                                             + 0.2466 * texture2D(source, qt_TexCoord0)
+                                             + 0.3229 * texture2D(source, qt_TexCoord0 + 1.364 * delta)
+                                             + 0.0538 * texture2D(source, qt_TexCoord0 + 3.182 * delta)) * qt_Opacity;
+                            }"
+                    }
+                }
+                property real angle: 0
+                property variant offset: Qt.point(15.0 * Math.cos(angle), 15.0 * Math.sin(angle))
+                NumberAnimation on angle { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 6000 }
+                property variant delta: Qt.size(offset.x / width, offset.y / height)
+                property real darkness: shadowSlider.value
+                fragmentShader: "
+                    uniform lowp float qt_Opacity;
+                    uniform highp vec2 offset;
+                    uniform sampler2D source;
+                    uniform sampler2D shadow;
+                    uniform highp float darkness;
+                    uniform highp vec2 delta;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 fg = texture2D(source, qt_TexCoord0);
+                        lowp vec4 bg = texture2D(shadow, qt_TexCoord0 + delta);
+                        gl_FragColor = (fg + vec4(0., 0., 0., darkness * bg.a) * (1. - fg.a)) * qt_Opacity;
+                    }"
+                Slider {
+                    id: shadowSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property variant delta: Qt.size(0.5 / width, 0.5 / height)
+                fragmentShader: "
+                    uniform sampler2D source;
+                    uniform highp vec2 delta;
+                    uniform highp float qt_Opacity;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 tl = texture2D(source, qt_TexCoord0 - delta);
+                        lowp vec4 tr = texture2D(source, qt_TexCoord0 + vec2(delta.x, -delta.y));
+                        lowp vec4 bl = texture2D(source, qt_TexCoord0 - vec2(delta.x, -delta.y));
+                        lowp vec4 br = texture2D(source, qt_TexCoord0 + delta);
+                        lowp vec4 gx = (tl + bl) - (tr + br);
+                        lowp vec4 gy = (tl + tr) - (bl + br);
+                        gl_FragColor.xyz = vec3(0.);
+                        gl_FragColor.w = clamp(dot(sqrt(gx * gx + gy * gy), vec4(1.)), 0., 1.) * qt_Opacity;
+                    }"
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                property variant source: theSource
+                property color tint: sliderToColor(colorizeSlider.value)
+                fragmentShader: "
+                    uniform sampler2D source;
+                    uniform lowp vec4 tint;
+                    uniform lowp float qt_Opacity;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        lowp vec4 c = texture2D(source, qt_TexCoord0);
+                        lowp float lo = min(min(c.x, c.y), c.z);
+                        lowp float hi = max(max(c.x, c.y), c.z);
+                        gl_FragColor = qt_Opacity * vec4(mix(vec3(lo), vec3(hi), tint.xyz), c.w);
+                    }"
+                Slider {
+                    id: colorizeSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+            ShaderEffect {
+                width: 180
+                height: 180
+                mesh: Qt.size(10, 10)
+                property variant source: theSource
+                property real bend: 0
+                property real minimize: 0
+                property real side: genieSlider.value
+                SequentialAnimation on bend {
+                    loops: Animation.Infinite
+                    NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1600 }
+                    NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1000 }
+                }
+                SequentialAnimation on minimize {
+                    loops: Animation.Infinite
+                    PauseAnimation { duration: 300 }
+                    NumberAnimation { to: 1; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1000 }
+                    NumberAnimation { to: 0; duration: 700; easing.type: Easing.InOutSine }
+                    PauseAnimation { duration: 1300 }
+                }
+                vertexShader: "
+                    uniform highp mat4 qt_Matrix;
+                    uniform highp float bend;
+                    uniform highp float minimize;
+                    uniform highp float side;
+                    uniform highp float width;
+                    uniform highp float height;
+                    attribute highp vec4 qt_Vertex;
+                    attribute highp vec2 qt_MultiTexCoord0;
+                    varying highp vec2 qt_TexCoord0;
+                    void main() {
+                        qt_TexCoord0 = qt_MultiTexCoord0;
+                        highp vec4 pos = qt_Vertex;
+                        pos.y = mix(qt_Vertex.y, height, minimize);
+                        highp float t = pos.y / height;
+                        t = (3. - 2. * t) * t * t;
+                        pos.x = mix(qt_Vertex.x, side * width, t * bend);
+                        gl_Position = qt_Matrix * pos;
+                    }"
+                Slider {
+                    id: genieSlider
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.bottom: parent.bottom
+                    height: 40
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/text/fonts/availableFonts.qml b/examples/qtquick/text/fonts/availableFonts.qml
index 0b87259556..0b87259556 100644
--- a/examples/declarative/text/fonts/availableFonts.qml
+++ b/examples/qtquick/text/fonts/availableFonts.qml
diff --git a/examples/declarative/text/fonts/banner.qml b/examples/qtquick/text/fonts/banner.qml
index 6c9aa25fa1..6c9aa25fa1 100644
--- a/examples/declarative/text/fonts/banner.qml
+++ b/examples/qtquick/text/fonts/banner.qml
diff --git a/examples/declarative/text/fonts/content/fonts/tarzeau_ocr_a.ttf b/examples/qtquick/text/fonts/content/fonts/tarzeau_ocr_a.ttf
index cf93f9651f..cf93f9651f 100644
--- a/examples/declarative/text/fonts/content/fonts/tarzeau_ocr_a.ttf
+++ b/examples/qtquick/text/fonts/content/fonts/tarzeau_ocr_a.ttf
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/qtquick/text/fonts/fonts.qml
index 78cef25eae..78cef25eae 100644
--- a/examples/declarative/text/fonts/fonts.qml
+++ b/examples/qtquick/text/fonts/fonts.qml
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/qtquick/text/fonts/hello.qml
index d9479fb208..d9479fb208 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/qtquick/text/fonts/hello.qml
diff --git a/examples/declarative/text/imgtag/TextWithImage.qml b/examples/qtquick/text/imgtag/TextWithImage.qml
index bc09aa2a52..bc09aa2a52 100644
--- a/examples/declarative/text/imgtag/TextWithImage.qml
+++ b/examples/qtquick/text/imgtag/TextWithImage.qml
diff --git a/examples/declarative/text/imgtag/images/face-sad.png b/examples/qtquick/text/imgtag/images/face-sad.png
index 24188b7985..24188b7985 100644
--- a/examples/declarative/text/imgtag/images/face-sad.png
+++ b/examples/qtquick/text/imgtag/images/face-sad.png
diff --git a/examples/declarative/text/imgtag/images/face-smile-big.png b/examples/qtquick/text/imgtag/images/face-smile-big.png
index d05e0bf21e..d05e0bf21e 100644
--- a/examples/declarative/text/imgtag/images/face-smile-big.png
+++ b/examples/qtquick/text/imgtag/images/face-smile-big.png
diff --git a/examples/declarative/text/imgtag/images/face-smile.png b/examples/qtquick/text/imgtag/images/face-smile.png
index e5e1d1353c..e5e1d1353c 100644
--- a/examples/declarative/text/imgtag/images/face-smile.png
+++ b/examples/qtquick/text/imgtag/images/face-smile.png
diff --git a/examples/declarative/text/imgtag/images/heart200.png b/examples/qtquick/text/imgtag/images/heart200.png
index cedd3ea608..cedd3ea608 100644
--- a/examples/declarative/text/imgtag/images/heart200.png
+++ b/examples/qtquick/text/imgtag/images/heart200.png
diff --git a/examples/declarative/text/imgtag/images/qtlogo.png b/examples/qtquick/text/imgtag/images/qtlogo.png
index 996719a4c6..996719a4c6 100644
--- a/examples/declarative/text/imgtag/images/qtlogo.png
+++ b/examples/qtquick/text/imgtag/images/qtlogo.png
diff --git a/examples/declarative/text/imgtag/images/starfish_2.png b/examples/qtquick/text/imgtag/images/starfish_2.png
index 132c20ffd0..132c20ffd0 100644
--- a/examples/declarative/text/imgtag/images/starfish_2.png
+++ b/examples/qtquick/text/imgtag/images/starfish_2.png
diff --git a/examples/declarative/text/imgtag/imgtag.qml b/examples/qtquick/text/imgtag/imgtag.qml
index 9d181af2cb..9d181af2cb 100644
--- a/examples/declarative/text/imgtag/imgtag.qml
+++ b/examples/qtquick/text/imgtag/imgtag.qml
diff --git a/examples/declarative/text/styledtext-layout.qml b/examples/qtquick/text/styledtext-layout.qml
index 4571330568..4571330568 100644
--- a/examples/declarative/text/styledtext-layout.qml
+++ b/examples/qtquick/text/styledtext-layout.qml
diff --git a/examples/declarative/text/text.qml b/examples/qtquick/text/text.qml
index 14a88d2e91..9bfd290059 100644
--- a/examples/declarative/text/text.qml
+++ b/examples/qtquick/text/text.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
diff --git a/examples/declarative/text/text.qmlproject b/examples/qtquick/text/text.qmlproject
index c08d9b9a89..c08d9b9a89 100644
--- a/examples/declarative/text/text.qmlproject
+++ b/examples/qtquick/text/text.qmlproject
diff --git a/examples/declarative/text/textselection/pics/endHandle.png b/examples/qtquick/text/textselection/pics/endHandle.png
index 1a4bc5d7a0..1a4bc5d7a0 100644
--- a/examples/declarative/text/textselection/pics/endHandle.png
+++ b/examples/qtquick/text/textselection/pics/endHandle.png
diff --git a/examples/declarative/text/textselection/pics/endHandle.sci b/examples/qtquick/text/textselection/pics/endHandle.sci
index 4f51f24278..4f51f24278 100644
--- a/examples/declarative/text/textselection/pics/endHandle.sci
+++ b/examples/qtquick/text/textselection/pics/endHandle.sci
diff --git a/examples/declarative/text/textselection/pics/startHandle.png b/examples/qtquick/text/textselection/pics/startHandle.png
index deedcd5c91..deedcd5c91 100644
--- a/examples/declarative/text/textselection/pics/startHandle.png
+++ b/examples/qtquick/text/textselection/pics/startHandle.png
diff --git a/examples/declarative/text/textselection/pics/startHandle.sci b/examples/qtquick/text/textselection/pics/startHandle.sci
index f9eae204c1..f9eae204c1 100644
--- a/examples/declarative/text/textselection/pics/startHandle.sci
+++ b/examples/qtquick/text/textselection/pics/startHandle.sci
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/qtquick/text/textselection/textselection.qml
index 7938ce5bf7..7938ce5bf7 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/qtquick/text/textselection/textselection.qml
diff --git a/examples/declarative/threading/threadedlistmodel/dataloader.js b/examples/qtquick/threading/threadedlistmodel/dataloader.js
index 4d2aab323d..4d2aab323d 100644
--- a/examples/declarative/threading/threadedlistmodel/dataloader.js
+++ b/examples/qtquick/threading/threadedlistmodel/dataloader.js
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject b/examples/qtquick/threading/threadedlistmodel/threadedlistmodel.qmlproject
index e7c8e69f14..e7c8e69f14 100644
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
+++ b/examples/qtquick/threading/threadedlistmodel/threadedlistmodel.qmlproject
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/qtquick/threading/threadedlistmodel/timedisplay.qml
index 48d0f659e5..48d0f659e5 100644
--- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+++ b/examples/qtquick/threading/threadedlistmodel/timedisplay.qml
diff --git a/examples/declarative/threading/workerscript/workerscript.js b/examples/qtquick/threading/workerscript/workerscript.js
index f76471f920..f76471f920 100644
--- a/examples/declarative/threading/workerscript/workerscript.js
+++ b/examples/qtquick/threading/workerscript/workerscript.js
diff --git a/examples/declarative/threading/workerscript/workerscript.qml b/examples/qtquick/threading/workerscript/workerscript.qml
index 7fced8166c..7fced8166c 100644
--- a/examples/declarative/threading/workerscript/workerscript.qml
+++ b/examples/qtquick/threading/workerscript/workerscript.qml
diff --git a/examples/declarative/threading/workerscript/workerscript.qmlproject b/examples/qtquick/threading/workerscript/workerscript.qmlproject
index 6d7a91feeb..6d7a91feeb 100644
--- a/examples/declarative/threading/workerscript/workerscript.qmlproject
+++ b/examples/qtquick/threading/workerscript/workerscript.qmlproject
diff --git a/examples/declarative/touchinteraction/multipointtouch/bearwhack.qml b/examples/qtquick/touchinteraction/multipointtouch/bearwhack.qml
index db46473c05..db46473c05 100644
--- a/examples/declarative/touchinteraction/multipointtouch/bearwhack.qml
+++ b/examples/qtquick/touchinteraction/multipointtouch/bearwhack.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml b/examples/qtquick/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
index aede1a8f4e..aede1a8f4e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear0.png b/examples/qtquick/touchinteraction/multipointtouch/content/Bear0.png
index 64a02cec8e..64a02cec8e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear0.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/Bear0.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear1.png b/examples/qtquick/touchinteraction/multipointtouch/content/Bear1.png
index 3b88f3b32e..3b88f3b32e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear1.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/Bear1.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear2.png b/examples/qtquick/touchinteraction/multipointtouch/content/Bear2.png
index 337b636070..337b636070 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear2.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/Bear2.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/Bear3.png b/examples/qtquick/touchinteraction/multipointtouch/content/Bear3.png
index f0e68590f4..f0e68590f4 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/Bear3.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/Bear3.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/BearB.png b/examples/qtquick/touchinteraction/multipointtouch/content/BearB.png
index c9a84ae1d4..c9a84ae1d4 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/BearB.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/BearB.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml b/examples/qtquick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
index 05d74ab0ea..05d74ab0ea 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/ParticleFlame.qml b/examples/qtquick/touchinteraction/multipointtouch/content/ParticleFlame.qml
index 9788c5c665..9788c5c665 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/ParticleFlame.qml
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/ParticleFlame.qml
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle.png b/examples/qtquick/touchinteraction/multipointtouch/content/blur-circle.png
index 1b03cd0b2c..1b03cd0b2c 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/blur-circle.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle3.png b/examples/qtquick/touchinteraction/multipointtouch/content/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/blur-circle3.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/blur-circle3.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/heart-blur.png b/examples/qtquick/touchinteraction/multipointtouch/content/heart-blur.png
index dbc38804ee..dbc38804ee 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/heart-blur.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/heart-blur.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/content/title.png b/examples/qtquick/touchinteraction/multipointtouch/content/title.png
index d630ea2643..d630ea2643 100644
--- a/examples/declarative/touchinteraction/multipointtouch/content/title.png
+++ b/examples/qtquick/touchinteraction/multipointtouch/content/title.png
diff --git a/examples/declarative/touchinteraction/multipointtouch/multiflame.qml b/examples/qtquick/touchinteraction/multipointtouch/multiflame.qml
index 72a0ce21f8..72a0ce21f8 100644
--- a/examples/declarative/touchinteraction/multipointtouch/multiflame.qml
+++ b/examples/qtquick/touchinteraction/multipointtouch/multiflame.qml
diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/qtquick/touchinteraction/pincharea/flickresize.qml
index 037766e4a0..037766e4a0 100644
--- a/examples/declarative/touchinteraction/pincharea/flickresize.qml
+++ b/examples/qtquick/touchinteraction/pincharea/flickresize.qml
diff --git a/examples/declarative/touchinteraction/pincharea/qt-logo.jpg b/examples/qtquick/touchinteraction/pincharea/qt-logo.jpg
index 4014b4659c..4014b4659c 100644
--- a/examples/declarative/touchinteraction/pincharea/qt-logo.jpg
+++ b/examples/qtquick/touchinteraction/pincharea/qt-logo.jpg
diff --git a/examples/declarative/touchinteraction/touchinteraction.qml b/examples/qtquick/touchinteraction/touchinteraction.qml
index ac0c8bfc55..b4a930c495 100644
--- a/examples/declarative/touchinteraction/touchinteraction.qml
+++ b/examples/qtquick/touchinteraction/touchinteraction.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import "../../shared"
 
 Item {
     height: 480
@@ -48,7 +48,6 @@ Item {
         id: ll
         anchors.fill: parent
         Component.onCompleted: {
-            addExample("MouseArea", "Using the basic touch input element", Qt.resolvedUrl("mousearea/mousearea-example.qml"));
             addExample("Multipoint Flames", "Create multiple flames with multiple fingers", Qt.resolvedUrl("multipointtouch/multiflame.qml"));
             addExample("Bear-Whack", "Use multiple touches to knock all the bears down",  Qt.resolvedUrl("multipointtouch/bearwhack.qml"));
             addExample("Flick Resize", "Manipulate images using pinch gestures", Qt.resolvedUrl("pincharea/flickresize.qml"));
diff --git a/examples/declarative/touchinteraction/touchinteraction.qmlproject b/examples/qtquick/touchinteraction/touchinteraction.qmlproject
index a9aa9d2e81..a9aa9d2e81 100644
--- a/examples/declarative/touchinteraction/touchinteraction.qmlproject
+++ b/examples/qtquick/touchinteraction/touchinteraction.qmlproject
diff --git a/examples/declarative/shared/Button.qml b/examples/shared/Button.qml
index a899a1410b..a899a1410b 100644
--- a/examples/declarative/shared/Button.qml
+++ b/examples/shared/Button.qml
diff --git a/examples/declarative/shared/LauncherList.qml b/examples/shared/LauncherList.qml
index 782fcc7ddd..492290dc3e 100644
--- a/examples/declarative/shared/LauncherList.qml
+++ b/examples/shared/LauncherList.qml
@@ -89,11 +89,12 @@ ListView {
             //Eats mouse events
         }
         Image {
-            source: "back.png"
+            source: "images/back.png"
             anchors.verticalCenter: parent.verticalCenter
             x: 4
             MouseArea {
                 anchors.fill: parent
+                anchors.margins: -10
                 onClicked: ei.exampleUrl = "";
             }
         }
diff --git a/examples/declarative/shared/README b/examples/shared/README
index bf16f238c7..bf16f238c7 100644
--- a/examples/declarative/shared/README
+++ b/examples/shared/README
diff --git a/examples/declarative/shared/SimpleLauncherDelegate.qml b/examples/shared/SimpleLauncherDelegate.qml
index c3708fe259..c3708fe259 100644
--- a/examples/declarative/shared/SimpleLauncherDelegate.qml
+++ b/examples/shared/SimpleLauncherDelegate.qml
diff --git a/examples/declarative/shared/back.png b/examples/shared/images/back.png
index 506ac42fcf..506ac42fcf 100644
--- a/examples/declarative/shared/back.png
+++ b/examples/shared/images/back.png
diff --git a/examples/shared/qmldir b/examples/shared/qmldir
new file mode 100644
index 0000000000..2f1e56aefb
--- /dev/null
+++ b/examples/shared/qmldir
@@ -0,0 +1,3 @@
+Button 2.0 Button.qml
+LauncherList 2.0 LauncherList.qml
+SimpleLauncherDelegate 2.0 SimpleLauncherDelegate.qml
diff --git a/examples/shared/shared.h b/examples/shared/shared.h
new file mode 100644
index 0000000000..e6d0130ec8
--- /dev/null
+++ b/examples/shared/shared.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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 <QGuiApplication>
+#include <QQuickView>
+#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
+{\
+    QGuiApplication app(argc,argv);\
+    QQuickView view;\
+    view.setSource(QUrl::fromLocalFile(#NAME ".qml"));\
+    view.show();\
+    return app.exec();\
+}
diff --git a/examples/shared/shared.pro b/examples/shared/shared.pro
new file mode 100644
index 0000000000..d6ce120f41
--- /dev/null
+++ b/examples/shared/shared.pro
@@ -0,0 +1,9 @@
+#just install the files, all QML for now
+TEMPLATE = aux
+
+qml.files = images \
+            LauncherList.qml \
+            SimpleLauncherDelegate.qml \
+            Button.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/shared
+INSTALLS = qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml
index f07613c968..f07613c968 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview1/PetsModel.qml
+++ b/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml
index 1a9dd453ce..1a9dd453ce 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview1/dynamicview.qml
+++ b/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview2/PetsModel.qml
+++ b/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml
index 9e654a685c..9e654a685c 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview2/dynamicview.qml
+++ b/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview3/PetsModel.qml
+++ b/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml
index 5a579f78d9..5a579f78d9 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview3/dynamicview.qml
+++ b/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml
index c6b8287beb..c6b8287beb 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/ListSelector.qml
+++ b/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml
index 4f2087d95e..4f2087d95e 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/PetsModel.qml
+++ b/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml
diff --git a/examples/declarative/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml
index 9bd4e0c438..9bd4e0c438 100644
--- a/examples/declarative/tutorials/dynamicview/dynamicview4/dynamicview.qml
+++ b/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/app.qml b/examples/tutorials/extending/chapter1-basics/app.qml
index 6f0c1d3a23..6f0c1d3a23 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/app.qml
+++ b/examples/tutorials/extending/chapter1-basics/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
index affc57ce1f..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
+++ b/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/tutorials/extending/chapter1-basics/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/tutorials/extending/chapter1-basics/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp b/examples/tutorials/extending/chapter1-basics/piechart.cpp
index bc81d6a3a0..bc81d6a3a0 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp
+++ b/examples/tutorials/extending/chapter1-basics/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/tutorials/extending/chapter1-basics/piechart.h
index 71a8786e7d..71a8786e7d 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h
+++ b/examples/tutorials/extending/chapter1-basics/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/app.qml b/examples/tutorials/extending/chapter2-methods/app.qml
index eee0933734..eee0933734 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/app.qml
+++ b/examples/tutorials/extending/chapter2-methods/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro
index affc57ce1f..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
+++ b/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/tutorials/extending/chapter2-methods/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/tutorials/extending/chapter2-methods/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp b/examples/tutorials/extending/chapter2-methods/piechart.cpp
index 71be74e943..71be74e943 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp
+++ b/examples/tutorials/extending/chapter2-methods/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/tutorials/extending/chapter2-methods/piechart.h
index 7650d6e8d7..7650d6e8d7 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h
+++ b/examples/tutorials/extending/chapter2-methods/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml b/examples/tutorials/extending/chapter3-bindings/app.qml
index 4ad929132c..4ad929132c 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/app.qml
+++ b/examples/tutorials/extending/chapter3-bindings/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index affc57ce1f..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
+++ b/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/tutorials/extending/chapter3-bindings/main.cpp
index ed9e412bd6..ed9e412bd6 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/tutorials/extending/chapter3-bindings/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/tutorials/extending/chapter3-bindings/piechart.cpp
index 2a392125da..2a392125da 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp
+++ b/examples/tutorials/extending/chapter3-bindings/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/tutorials/extending/chapter3-bindings/piechart.h
index 77075b5727..77075b5727 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h
+++ b/examples/tutorials/extending/chapter3-bindings/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml
index 06490773f4..06490773f4 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index 6724fa0375..6724fa0375 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index 537ea766fc..537ea766fc 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
index 3cf9bdc00c..3cf9bdc00c 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h
index b89db5a2b1..b89db5a2b1 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
index 654a46fc8d..654a46fc8d 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
index 8fc445d471..8fc445d471 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
+++ b/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml b/examples/tutorials/extending/chapter5-listproperties/app.qml
index 37b0626948..37b0626948 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml
+++ b/examples/tutorials/extending/chapter5-listproperties/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index 6724fa0375..6724fa0375 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
+++ b/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/tutorials/extending/chapter5-listproperties/main.cpp
index 59587733eb..59587733eb 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/tutorials/extending/chapter5-listproperties/main.cpp
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/tutorials/extending/chapter5-listproperties/piechart.cpp
index bfcb607e60..bfcb607e60 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp
+++ b/examples/tutorials/extending/chapter5-listproperties/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/tutorials/extending/chapter5-listproperties/piechart.h
index 9beabda5f3..9beabda5f3 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h
+++ b/examples/tutorials/extending/chapter5-listproperties/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp
index 5bca2d58d8..5bca2d58d8 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp
+++ b/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/tutorials/extending/chapter5-listproperties/pieslice.h
index f6497fcbae..f6497fcbae 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h
+++ b/examples/tutorials/extending/chapter5-listproperties/pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir b/examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
index 72650d8243..72650d8243 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
+++ b/examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml b/examples/tutorials/extending/chapter6-plugins/app.qml
index b6eac44e27..b6eac44e27 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/tutorials/extending/chapter6-plugins/app.qml
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index c243ec4572..c243ec4572 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp
index d75f810964..d75f810964 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp
+++ b/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
index 863564b09c..863564b09c 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h
+++ b/examples/tutorials/extending/chapter6-plugins/chartsplugin.h
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/tutorials/extending/chapter6-plugins/piechart.cpp
index 2a8f40289e..2a8f40289e 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp
+++ b/examples/tutorials/extending/chapter6-plugins/piechart.cpp
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/tutorials/extending/chapter6-plugins/piechart.h
index fe6b96afdc..fe6b96afdc 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h
+++ b/examples/tutorials/extending/chapter6-plugins/piechart.h
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/tutorials/extending/chapter6-plugins/pieslice.cpp
index 5bca2d58d8..5bca2d58d8 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp
+++ b/examples/tutorials/extending/chapter6-plugins/pieslice.cpp
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/tutorials/extending/chapter6-plugins/pieslice.h
index 8a636fb3e7..8a636fb3e7 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h
+++ b/examples/tutorials/extending/chapter6-plugins/pieslice.h
diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/tutorials/extending/extending.pro
index 967473fda0..967473fda0 100644
--- a/examples/declarative/tutorials/extending/extending.pro
+++ b/examples/tutorials/extending/extending.pro
diff --git a/examples/declarative/tutorials/helloworld/Cell.qml b/examples/tutorials/helloworld/Cell.qml
index 7140dcb2c1..7140dcb2c1 100644
--- a/examples/declarative/tutorials/helloworld/Cell.qml
+++ b/examples/tutorials/helloworld/Cell.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/tutorials/helloworld/tutorial1.qml
index f0eb42d696..f0eb42d696 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/tutorials/helloworld/tutorial1.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/tutorials/helloworld/tutorial2.qml
index c5c045aace..c5c045aace 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/tutorials/helloworld/tutorial2.qml
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/tutorials/helloworld/tutorial3.qml
index c804bfca1d..c804bfca1d 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/tutorials/helloworld/tutorial3.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/tutorials/samegame/samegame1/Block.qml
index 32ef8c2bba..32ef8c2bba 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/tutorials/samegame/samegame1/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/tutorials/samegame/samegame1/Button.qml
index 6d1d1268de..6d1d1268de 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/tutorials/samegame/samegame1/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/tutorials/samegame/samegame1/samegame.qml
index 73e2cc31fd..73e2cc31fd 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/tutorials/samegame/samegame1/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/tutorials/samegame/samegame1/samegame1.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame1.qmlproject
+++ b/examples/tutorials/samegame/samegame1/samegame1.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/tutorials/samegame/samegame2/Block.qml
index 8056b39480..8056b39480 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/tutorials/samegame/samegame2/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/tutorials/samegame/samegame2/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/tutorials/samegame/samegame2/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/tutorials/samegame/samegame2/samegame.js
index c749dc17b1..c749dc17b1 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/tutorials/samegame/samegame2/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/tutorials/samegame/samegame2/samegame.qml
index c50010e97d..c50010e97d 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/tutorials/samegame/samegame2/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/tutorials/samegame/samegame2/samegame2.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame2.qmlproject
+++ b/examples/tutorials/samegame/samegame2/samegame2.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/tutorials/samegame/samegame3/Block.qml
index 9c41048fcb..9c41048fcb 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Block.qml
+++ b/examples/tutorials/samegame/samegame3/Block.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/tutorials/samegame/samegame3/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/tutorials/samegame/samegame3/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/tutorials/samegame/samegame3/Dialog.qml
index df1fa37d6a..df1fa37d6a 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/tutorials/samegame/samegame3/Dialog.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/tutorials/samegame/samegame3/samegame.js
index df5bdfb049..df5bdfb049 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/tutorials/samegame/samegame3/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/tutorials/samegame/samegame3/samegame.qml
index f14829ef63..f14829ef63 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/tutorials/samegame/samegame3/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/tutorials/samegame/samegame3/samegame3.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame3.qmlproject
+++ b/examples/tutorials/samegame/samegame3/samegame3.qmlproject
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/tutorials/samegame/samegame4/content/BoomBlock.qml
index 3786b9c0d1..3786b9c0d1 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/tutorials/samegame/samegame4/content/BoomBlock.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/tutorials/samegame/samegame4/content/Button.qml
index 248c20cf0f..248c20cf0f 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/tutorials/samegame/samegame4/content/Button.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/tutorials/samegame/samegame4/content/Dialog.qml
index 984b3ddb6a..984b3ddb6a 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/tutorials/samegame/samegame4/content/Dialog.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/tutorials/samegame/samegame4/content/samegame.js
index 7bb7243914..7bb7243914 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/tutorials/samegame/samegame4/content/samegame.js
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/README b/examples/tutorials/samegame/samegame4/highscores/README
index eaa00fae37..eaa00fae37 100644
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/README
+++ b/examples/tutorials/samegame/samegame4/highscores/README
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/tutorials/samegame/samegame4/highscores/score_data.xml
index c3fd90d9cf..c3fd90d9cf 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_data.xml
+++ b/examples/tutorials/samegame/samegame4/highscores/score_data.xml
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/tutorials/samegame/samegame4/highscores/score_style.xsl
index 670354c965..670354c965 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/score_style.xsl
+++ b/examples/tutorials/samegame/samegame4/highscores/score_style.xsl
diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/tutorials/samegame/samegame4/highscores/scores.php
index daf480e21b..daf480e21b 100755
--- a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php
+++ b/examples/tutorials/samegame/samegame4/highscores/scores.php
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/tutorials/samegame/samegame4/samegame.qml
index c21b8de8bd..c21b8de8bd 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/tutorials/samegame/samegame4/samegame.qml
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/tutorials/samegame/samegame4/samegame4.qmlproject
index 42ffacf4f8..42ffacf4f8 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame4.qmlproject
+++ b/examples/tutorials/samegame/samegame4/samegame4.qmlproject
diff --git a/examples/declarative/tutorials/samegame/shared/pics/background.jpg b/examples/tutorials/samegame/shared/pics/background.jpg
index 903d395c8d..903d395c8d 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/background.jpg
+++ b/examples/tutorials/samegame/shared/pics/background.jpg
diff --git a/examples/declarative/tutorials/samegame/shared/pics/blueStar.png b/examples/tutorials/samegame/shared/pics/blueStar.png
index ff9588f80a..ff9588f80a 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/blueStar.png
+++ b/examples/tutorials/samegame/shared/pics/blueStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/blueStone.png b/examples/tutorials/samegame/shared/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/blueStone.png
+++ b/examples/tutorials/samegame/shared/pics/blueStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/greenStar.png b/examples/tutorials/samegame/shared/pics/greenStar.png
index cd06854719..cd06854719 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/greenStar.png
+++ b/examples/tutorials/samegame/shared/pics/greenStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/greenStone.png b/examples/tutorials/samegame/shared/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/greenStone.png
+++ b/examples/tutorials/samegame/shared/pics/greenStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/redStar.png b/examples/tutorials/samegame/shared/pics/redStar.png
index 0a4dffe583..0a4dffe583 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/redStar.png
+++ b/examples/tutorials/samegame/shared/pics/redStar.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/redStone.png b/examples/tutorials/samegame/shared/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/redStone.png
+++ b/examples/tutorials/samegame/shared/pics/redStone.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/star.png b/examples/tutorials/samegame/shared/pics/star.png
index defbde53ca..defbde53ca 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/star.png
+++ b/examples/tutorials/samegame/shared/pics/star.png
diff --git a/examples/declarative/tutorials/samegame/shared/pics/yellowStone.png b/examples/tutorials/samegame/shared/pics/yellowStone.png
index b1ce76212c..b1ce76212c 100644
--- a/examples/declarative/tutorials/samegame/shared/pics/yellowStone.png
+++ b/examples/tutorials/samegame/shared/pics/yellowStone.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/Dial.qml b/examples/tutorials/ui-components/dialcontrol/content/Dial.qml
index c61adee364..c61adee364 100644
--- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+++ b/examples/tutorials/ui-components/dialcontrol/content/Dial.qml
diff --git a/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml b/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml
new file mode 100644
index 0000000000..702b892d23
--- /dev/null
+++ b/examples/tutorials/ui-components/dialcontrol/content/QuitButton.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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 Nokia Corporation 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/declarative/ui-components/dialcontrol/content/background.png b/examples/tutorials/ui-components/dialcontrol/content/background.png
index 75d555d7ab..75d555d7ab 100644
--- a/examples/declarative/ui-components/dialcontrol/content/background.png
+++ b/examples/tutorials/ui-components/dialcontrol/content/background.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle.png b/examples/tutorials/ui-components/dialcontrol/content/needle.png
index 2d19f75039..2d19f75039 100644
--- a/examples/declarative/ui-components/dialcontrol/content/needle.png
+++ b/examples/tutorials/ui-components/dialcontrol/content/needle.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png b/examples/tutorials/ui-components/dialcontrol/content/needle_shadow.png
index 8d8a928cc5..8d8a928cc5 100644
--- a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
+++ b/examples/tutorials/ui-components/dialcontrol/content/needle_shadow.png
diff --git a/examples/declarative/ui-components/dialcontrol/content/overlay.png b/examples/tutorials/ui-components/dialcontrol/content/overlay.png
index 3860a7b590..3860a7b590 100644
--- a/examples/declarative/ui-components/dialcontrol/content/overlay.png
+++ b/examples/tutorials/ui-components/dialcontrol/content/overlay.png
diff --git a/examples/tutorials/ui-components/dialcontrol/content/quit.png b/examples/tutorials/ui-components/dialcontrol/content/quit.png
new file mode 100644
index 0000000000..b822057d4e
--- /dev/null
+++ b/examples/tutorials/ui-components/dialcontrol/content/quit.png
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/tutorials/ui-components/dialcontrol/dialcontrol.qml
index d645b34aa4..d645b34aa4 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/tutorials/ui-components/dialcontrol/dialcontrol.qml
diff --git a/examples/declarative/ui-components/flipable/content/5_heart.png b/examples/tutorials/ui-components/flipable/content/5_heart.png
index fb59d81453..fb59d81453 100644
--- a/examples/declarative/ui-components/flipable/content/5_heart.png
+++ b/examples/tutorials/ui-components/flipable/content/5_heart.png
diff --git a/examples/declarative/ui-components/flipable/content/9_club.png b/examples/tutorials/ui-components/flipable/content/9_club.png
index 2545001904..2545001904 100644
--- a/examples/declarative/ui-components/flipable/content/9_club.png
+++ b/examples/tutorials/ui-components/flipable/content/9_club.png
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/tutorials/ui-components/flipable/content/Card.qml
index 6006ea14fc..6006ea14fc 100644
--- a/examples/declarative/ui-components/flipable/content/Card.qml
+++ b/examples/tutorials/ui-components/flipable/content/Card.qml
diff --git a/examples/declarative/ui-components/flipable/content/back.png b/examples/tutorials/ui-components/flipable/content/back.png
index f715d7487e..f715d7487e 100644
--- a/examples/declarative/ui-components/flipable/content/back.png
+++ b/examples/tutorials/ui-components/flipable/content/back.png
diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/tutorials/ui-components/flipable/flipable.qml
index 4af64afc53..4af64afc53 100644
--- a/examples/declarative/ui-components/flipable/flipable.qml
+++ b/examples/tutorials/ui-components/flipable/flipable.qml
diff --git a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml b/examples/tutorials/ui-components/progressbar/content/ProgressBar.qml
index c9be8d7336..c9be8d7336 100644
--- a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
+++ b/examples/tutorials/ui-components/progressbar/content/ProgressBar.qml
diff --git a/examples/declarative/ui-components/progressbar/content/background.png b/examples/tutorials/ui-components/progressbar/content/background.png
index 9044226f85..9044226f85 100644
--- a/examples/declarative/ui-components/progressbar/content/background.png
+++ b/examples/tutorials/ui-components/progressbar/content/background.png
diff --git a/examples/declarative/ui-components/progressbar/main.qml b/examples/tutorials/ui-components/progressbar/main.qml
index 367e4c1265..367e4c1265 100644
--- a/examples/declarative/ui-components/progressbar/main.qml
+++ b/examples/tutorials/ui-components/progressbar/main.qml
diff --git a/examples/declarative/ui-components/scrollbar/ScrollBar.qml b/examples/tutorials/ui-components/scrollbar/ScrollBar.qml
index a3d0d3841c..a3d0d3841c 100644
--- a/examples/declarative/ui-components/scrollbar/ScrollBar.qml
+++ b/examples/tutorials/ui-components/scrollbar/ScrollBar.qml
diff --git a/examples/declarative/ui-components/scrollbar/main.qml b/examples/tutorials/ui-components/scrollbar/main.qml
index a7d602b437..a7d602b437 100644
--- a/examples/declarative/ui-components/scrollbar/main.qml
+++ b/examples/tutorials/ui-components/scrollbar/main.qml
diff --git a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg b/examples/tutorials/ui-components/scrollbar/pics/niagara_falls.jpg
index e625c0d3e6..e625c0d3e6 100644
--- a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
+++ b/examples/tutorials/ui-components/scrollbar/pics/niagara_falls.jpg
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject b/examples/tutorials/ui-components/scrollbar/scrollbar.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
+++ b/examples/tutorials/ui-components/scrollbar/scrollbar.qmlproject
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/tutorials/ui-components/searchbox/SearchBox.qml
index 6f6f486412..6f6f486412 100644
--- a/examples/declarative/ui-components/searchbox/SearchBox.qml
+++ b/examples/tutorials/ui-components/searchbox/SearchBox.qml
diff --git a/examples/declarative/ui-components/searchbox/images/clear.png b/examples/tutorials/ui-components/searchbox/images/clear.png
index 91eb270695..91eb270695 100644
--- a/examples/declarative/ui-components/searchbox/images/clear.png
+++ b/examples/tutorials/ui-components/searchbox/images/clear.png
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png b/examples/tutorials/ui-components/searchbox/images/lineedit-bg-focus.png
index bbfac38d2d..bbfac38d2d 100644
--- a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
+++ b/examples/tutorials/ui-components/searchbox/images/lineedit-bg-focus.png
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png b/examples/tutorials/ui-components/searchbox/images/lineedit-bg.png
index 9044226f85..9044226f85 100644
--- a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png
+++ b/examples/tutorials/ui-components/searchbox/images/lineedit-bg.png
diff --git a/examples/declarative/ui-components/searchbox/main.qml b/examples/tutorials/ui-components/searchbox/main.qml
index 6e9731cf9c..6e9731cf9c 100644
--- a/examples/declarative/ui-components/searchbox/main.qml
+++ b/examples/tutorials/ui-components/searchbox/main.qml
diff --git a/examples/declarative/ui-components/searchbox/searchbox.qmlproject b/examples/tutorials/ui-components/searchbox/searchbox.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.qmlproject
+++ b/examples/tutorials/ui-components/searchbox/searchbox.qmlproject
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/tutorials/ui-components/slideswitch/content/Switch.qml
index 981fc16673..981fc16673 100644
--- a/examples/declarative/ui-components/slideswitch/content/Switch.qml
+++ b/examples/tutorials/ui-components/slideswitch/content/Switch.qml
diff --git a/examples/declarative/ui-components/slideswitch/content/background.png b/examples/tutorials/ui-components/slideswitch/content/background.png
index d736815870..d736815870 100644
--- a/examples/declarative/ui-components/slideswitch/content/background.png
+++ b/examples/tutorials/ui-components/slideswitch/content/background.png
diff --git a/examples/declarative/ui-components/slideswitch/content/background.svg b/examples/tutorials/ui-components/slideswitch/content/background.svg
index f920d3e47a..f920d3e47a 100644
--- a/examples/declarative/ui-components/slideswitch/content/background.svg
+++ b/examples/tutorials/ui-components/slideswitch/content/background.svg
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.png b/examples/tutorials/ui-components/slideswitch/content/knob.png
index ee0a436f84..ee0a436f84 100644
--- a/examples/declarative/ui-components/slideswitch/content/knob.png
+++ b/examples/tutorials/ui-components/slideswitch/content/knob.png
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.svg b/examples/tutorials/ui-components/slideswitch/content/knob.svg
index fb6933718e..fb6933718e 100644
--- a/examples/declarative/ui-components/slideswitch/content/knob.svg
+++ b/examples/tutorials/ui-components/slideswitch/content/knob.svg
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qml b/examples/tutorials/ui-components/slideswitch/slideswitch.qml
index 60a331407c..60a331407c 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.qml
+++ b/examples/tutorials/ui-components/slideswitch/slideswitch.qml
diff --git a/examples/declarative/ui-components/spinner/content/Spinner.qml b/examples/tutorials/ui-components/spinner/content/Spinner.qml
index d7bbeb33ee..d7bbeb33ee 100644
--- a/examples/declarative/ui-components/spinner/content/Spinner.qml
+++ b/examples/tutorials/ui-components/spinner/content/Spinner.qml
diff --git a/examples/declarative/ui-components/spinner/content/spinner-bg.png b/examples/tutorials/ui-components/spinner/content/spinner-bg.png
index b3556f1f9f..b3556f1f9f 100644
--- a/examples/declarative/ui-components/spinner/content/spinner-bg.png
+++ b/examples/tutorials/ui-components/spinner/content/spinner-bg.png
diff --git a/examples/declarative/ui-components/spinner/content/spinner-select.png b/examples/tutorials/ui-components/spinner/content/spinner-select.png
index 95a17a1fe2..95a17a1fe2 100644
--- a/examples/declarative/ui-components/spinner/content/spinner-select.png
+++ b/examples/tutorials/ui-components/spinner/content/spinner-select.png
diff --git a/examples/declarative/ui-components/spinner/main.qml b/examples/tutorials/ui-components/spinner/main.qml
index 7584c98396..7584c98396 100644
--- a/examples/declarative/ui-components/spinner/main.qml
+++ b/examples/tutorials/ui-components/spinner/main.qml
diff --git a/examples/declarative/ui-components/spinner/spinner.qmlproject b/examples/tutorials/ui-components/spinner/spinner.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/spinner/spinner.qmlproject
+++ b/examples/tutorials/ui-components/spinner/spinner.qmlproject
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/tutorials/ui-components/tabwidget/TabWidget.qml
index 560ed1f58a..560ed1f58a 100644
--- a/examples/declarative/ui-components/tabwidget/TabWidget.qml
+++ b/examples/tutorials/ui-components/tabwidget/TabWidget.qml
diff --git a/examples/declarative/ui-components/tabwidget/main.qml b/examples/tutorials/ui-components/tabwidget/main.qml
index df99c11b7d..df99c11b7d 100644
--- a/examples/declarative/ui-components/tabwidget/main.qml
+++ b/examples/tutorials/ui-components/tabwidget/main.qml
diff --git a/examples/declarative/ui-components/tabwidget/tab.png b/examples/tutorials/ui-components/tabwidget/tab.png
index ad8021605f..ad8021605f 100644
--- a/examples/declarative/ui-components/tabwidget/tab.png
+++ b/examples/tutorials/ui-components/tabwidget/tab.png
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject b/examples/tutorials/ui-components/tabwidget/tabwidget.qmlproject
index e5a8bf02ca..e5a8bf02ca 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
+++ b/examples/tutorials/ui-components/tabwidget/tabwidget.qmlproject
diff --git a/examples/declarative/window/Window.qml b/examples/window/Window.qml
index 48478458c6..48478458c6 100644
--- a/examples/declarative/window/Window.qml
+++ b/examples/window/Window.qml
diff --git a/examples/declarative/window/screen/screenInfo.qml b/examples/window/screen/screenInfo.qml
index 54299ba4e0..54299ba4e0 100644
--- a/examples/declarative/window/screen/screenInfo.qml
+++ b/examples/window/screen/screenInfo.qml
diff --git a/examples/declarative/window/standalone.qml b/examples/window/standalone.qml
index 335cf7b635..335cf7b635 100644
--- a/examples/declarative/window/standalone.qml
+++ b/examples/window/standalone.qml
diff --git a/examples/declarative/window/window.cpp b/examples/window/window.cpp
index 4854256190..4854256190 100644
--- a/examples/declarative/window/window.cpp
+++ b/examples/window/window.cpp
diff --git a/examples/declarative/window/window.pro b/examples/window/window.pro
index 74804bd776..74804bd776 100644
--- a/examples/declarative/window/window.pro
+++ b/examples/window/window.pro
diff --git a/tests/auto/qtquick2/examples/tst_examples.cpp b/tests/auto/qtquick2/examples/tst_examples.cpp
index 0e420f7277..ce8f214efd 100644
--- a/tests/auto/qtquick2/examples/tst_examples.cpp
+++ b/tests/auto/qtquick2/examples/tst_examples.cpp
@@ -89,32 +89,25 @@ tst_examples::tst_examples()
     excludedFiles << "doc/src/snippets/declarative/listmodel.qml"; //Just a ListModel, no root QQuickItem
 
     // Add directories you want excluded here
-    excludedDirs << "examples/declarative/text/fonts"; // QTBUG-21415
+    excludedDirs << "examples/shared"; //Not an example
+    excludedDirs << "examples/qtquick/text/fonts"; // QTBUG-21415
     excludedDirs << "doc/src/snippets/declarative/path"; //No root QQuickItem
 
-    // Not run in QQuickView
-    excludedDirs << "examples/declarative/qtquick1";
-
     // These snippets are not expected to run on their own.
     excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex";
     excludedDirs << "doc/src/snippets/declarative/qtbinding";
     excludedDirs << "doc/src/snippets/declarative/imports";
-    excludedDirs << "doc/src/snippets/qtquick1/visualdatamodel_rootindex";
-    excludedDirs << "doc/src/snippets/qtquick1/qtbinding";
-    excludedDirs << "doc/src/snippets/qtquick1/imports";
 
 #ifdef QT_NO_WEBKIT
-    excludedDirs << "examples/declarative/modelviews/webview";
-    excludedDirs << "examples/declarative/webbrowser";
+    excludedDirs << "examples/qtquick/modelviews/webview";
+    excludedDirs << "examples/demos/webbrowser";
     excludedDirs << "doc/src/snippets/declarative/webview";
-    excludedDirs << "doc/src/snippets/qtquick1/webview";
 #endif
 
 #ifdef QT_NO_XMLPATTERNS
-    excludedDirs << "examples/declarative/xml/xmldata";
-    excludedDirs << "examples/declarative/twitter";
-    excludedDirs << "examples/declarative/flickr";
-    excludedDirs << "examples/declarative/photoviewer";
+    excludedDirs << "examples/demos/twitter";
+    excludedDirs << "examples/demos/flickr";
+    excludedDirs << "examples/demos/photoviewer";
 #endif
 }
 
@@ -230,12 +223,10 @@ void tst_examples::sgexamples_data()
 {
     QTest::addColumn<QString>("file");
 
-    QString examples = QLatin1String(SRCDIR) + "/../../../../examples/declarative/";
-    QString tutorials = QLatin1String(SRCDIR) + "/../../../../examples/tutorials/"; //Only declarative tutorials since modularization
+    QString examples = QLatin1String(SRCDIR) + "/../../../../examples/";
 
     QStringList files;
     files << findQmlFiles(QDir(examples));
-    files << findQmlFiles(QDir(tutorials));
 
     foreach (const QString &file, files)
         QTest::newRow(qPrintable(file)) << file;