403 files changed, 2179 insertions, 2994 deletions
diff --git a/demos/declarative/button.qml b/demos/declarative/button.qml
deleted file mode 100644
index 8e00b9762..000000000
--- a/demos/declarative/button.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
-    width: 640; height: 480
-
-    Item3D {
-        id: button_mesh
-        objectName: "button_mesh"
-        mesh: Mesh {
-            source: "meshes/button3d.3ds"
-            options: "ShowWarnings ForceSmooth"
-        }
-        cullFaces: "CullBackFaces"
-
-        Item3D {
-            id: top_node
-            objectName: "top_node"
-            meshNode: "Top"
-            effect: Effect { material: face_texture }
-        }
-
-        Material {
-            id: face_texture
-            objectName: "face_texture"
-            ambientColor: "#000000"
-            specularColor: "#000000"
-            shininess: 16
-            textureUrl: "textures/button/face.png"
-        }
-
-        Item3D {
-            id: side_plate_node
-            objectName: "side_plate_node"
-            meshNode: "SidePlate"
-            //effect: Effect { material: address_texture }
-        }
-
-        Material {
-            id: address_texture
-            objectName: "address_texture"
-            ambientColor: "#000000"
-            specularColor: "#000000"
-            shininess: 16
-            textureUrl: "textures/button/full-address.png"
-        }
-
-        Light {
-            id: l1
-            position: Qt.vector3d(-1, -10, 10)
-        }
-    }
-}
diff --git a/demos/declarative/forest/forest.qmlproject b/demos/declarative/forest/forest.qmlproject
deleted file mode 100644
index d4909f868..000000000
--- a/demos/declarative/forest/forest.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/demos/declarative/lander/lander.qmlproject b/demos/declarative/lander/lander.qmlproject
deleted file mode 100644
index 9062c6a41..000000000
--- a/demos/declarative/lander/lander.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/demos/declarative/meshes/basket.bez b/demos/declarative/meshes/basket.bez
deleted file mode 100644
index 614daf09b..000000000
--- a/demos/declarative/meshes/basket.bez
+++ /dev/null
@@ -1,332 +0,0 @@
-24
-1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
-4,17,18,19,8,20,21,22,12,23,24,25,16,26,27,28
-19,29,30,31,22,32,33,34,25,35,36,37,28,38,39,40
-31,41,42,1,34,43,44,5,37,45,46,9,40,47,48,13
-13,14,15,16,49,50,51,52,53,54,55,56,57,58,59,60
-16,26,27,28,52,61,62,63,56,64,65,66,60,67,68,69
-28,38,39,40,63,70,71,72,66,73,74,75,69,76,77,78
-40,47,48,13,72,79,80,49,75,81,82,53,78,83,84,57
-57,58,59,60,85,86,87,88,89,90,91,92,93,94,95,96
-60,67,68,69,88,97,98,99,92,100,101,102,96,103,104,105
-69,76,77,78,99,106,107,108,102,109,110,111,105,112,113,114
-78,83,84,57,108,115,116,85,111,117,118,89,114,119,120,93
-204,204,204,204,207,208,209,210,211,211,211,211,212,213,214,215,4
-204,204,204,204,210,217,218,219,211,211,211,211,215,220,221,222,4
-204,204,204,204,219,224,225,226,211,211,211,211,222,227,228,229,4
-204,204,204,204,226,230,231,207,211,211,211,211,229,232,233,212,4
-212,213,214,215,234,235,236,237,238,239,240,241,242,243,244,245
-215,220,221,222,237,246,247,248,241,249,250,251,245,252,253,254
-222,227,228,229,248,255,256,257,251,258,259,260,254,261,262,263
-229,232,233,212,257,264,265,234,260,266,267,238,263,268,269,242
-270,270,270,270,279,280,281,282,275,276,277,278,271,272,273,274,4
-270,270,270,270,282,289,290,291,278,286,287,288,274,283,284,285,4
-270,270,270,270,291,298,299,300,288,295,296,297,285,292,293,294,4
-270,270,270,270,300,305,306,279,297,303,304,275,294,301,302,271,4
-306
-0.700000,0.450000,-0.000000
-0.700000,0.450000,0.392000
-0.392000,0.450000,0.700000
-0.000000,0.450000,0.700000
-0.668750,0.515625,-0.000000
-0.668750,0.515625,0.374500
-0.374500,0.515625,0.668750
-0.000000,0.515625,0.668750
-0.718750,0.515625,-0.000000
-0.718750,0.515625,0.402500
-0.402500,0.515625,0.718750
-0.000000,0.515625,0.718750
-0.750000,0.450000,-0.000000
-0.750000,0.450000,0.420000
-0.420000,0.450000,0.750000
-0.000000,0.450000,0.750000
--0.392000,0.450000,0.700000
--0.700000,0.450000,0.392000
--0.700000,0.450000,-0.000000
--0.374500,0.515625,0.668750
--0.668750,0.515625,0.374500
--0.668750,0.515625,-0.000000
--0.402500,0.515625,0.718750
--0.718750,0.515625,0.402500
--0.718750,0.515625,-0.000000
--0.420000,0.450000,0.750000
--0.750000,0.450000,0.420000
--0.750000,0.450000,-0.000000
--0.700000,0.450000,-0.392000
--0.392000,0.450000,-0.700000
-0.000000,0.450000,-0.700000
--0.668750,0.515625,-0.374500
--0.374500,0.515625,-0.668750
-0.000000,0.515625,-0.668750
--0.718750,0.515625,-0.402500
--0.402500,0.515625,-0.718750
-0.000000,0.515625,-0.718750
--0.750000,0.450000,-0.420000
--0.420000,0.450000,-0.750000
-0.000000,0.450000,-0.750000
-0.392000,0.450000,-0.700000
-0.700000,0.450000,-0.392000
-0.374500,0.515625,-0.668750
-0.668750,0.515625,-0.374500
-0.402500,0.515625,-0.718750
-0.718750,0.515625,-0.402500
-0.420000,0.450000,-0.750000
-0.750000,0.450000,-0.420000
-0.875000,0.187500,-0.000000
-0.875000,0.187500,0.490000
-0.490000,0.187500,0.875000
-0.000000,0.187500,0.875000
-1.000000,-0.075000,-0.000000
-1.000000,-0.075000,0.560000
-0.560000,-0.075000,1.000000
-0.000000,-0.075000,1.000000
-1.000000,-0.300000,-0.000000
-1.000000,-0.300000,0.560000
-0.560000,-0.300000,1.000000
-0.000000,-0.300000,1.000000
--0.490000,0.187500,0.875000
--0.875000,0.187500,0.490000
--0.875000,0.187500,-0.000000
--0.560000,-0.075000,1.000000
--1.000000,-0.075000,0.560000
--1.000000,-0.075000,-0.000000
--0.560000,-0.300000,1.000000
--1.000000,-0.300000,0.560000
--1.000000,-0.300000,-0.000000
--0.875000,0.187500,-0.490000
--0.490000,0.187500,-0.875000
-0.000000,0.187500,-0.875000
--1.000000,-0.075000,-0.560000
--0.560000,-0.075000,-1.000000
-0.000000,-0.075000,-1.000000
--1.000000,-0.300000,-0.560000
--0.560000,-0.300000,-1.000000
-0.000000,-0.300000,-1.000000
-0.490000,0.187500,-0.875000
-0.875000,0.187500,-0.490000
-0.560000,-0.075000,-1.000000
-1.000000,-0.075000,-0.560000
-0.560000,-0.300000,-1.000000
-1.000000,-0.300000,-0.560000
-1.000000,-0.525000,-0.000000
-1.000000,-0.525000,0.560000
-0.560000,-0.525000,1.000000
-0.000000,-0.525000,1.000000
-0.750000,-0.637500,-0.000000
-0.750000,-0.637500,0.420000
-0.420000,-0.637500,0.750000
-0.000000,-0.637500,0.750000
-0.750000,-0.675000,-0.000000
-0.750000,-0.675000,0.420000
-0.420000,-0.675000,0.750000
-0.000000,-0.675000,0.750000
--0.560000,-0.525000,1.000000
--1.000000,-0.525000,0.560000
--1.000000,-0.525000,-0.000000
--0.420000,-0.637500,0.750000
--0.750000,-0.637500,0.420000
--0.750000,-0.637500,-0.000000
--0.420000,-0.675000,0.750000
--0.750000,-0.675000,0.420000
--0.750000,-0.675000,-0.000000
--1.000000,-0.525000,-0.560000
--0.560000,-0.525000,-1.000000
-0.000000,-0.525000,-1.000000
--0.750000,-0.637500,-0.420000
--0.420000,-0.637500,-0.750000
-0.000000,-0.637500,-0.750000
--0.750000,-0.675000,-0.420000
--0.420000,-0.675000,-0.750000
-0.000000,-0.675000,-0.750000
-0.560000,-0.525000,-1.000000
-1.000000,-0.525000,-0.560000
-0.420000,-0.637500,-0.750000
-0.750000,-0.637500,-0.420000
-0.420000,-0.675000,-0.750000
-0.750000,-0.675000,-0.420000
--0.800000,0.262500,-0.000000
--0.800000,0.262500,0.150000
--0.750000,0.375000,0.150000
--0.750000,0.375000,-0.000000
--1.150000,0.262500,-0.000000
--1.150000,0.262500,0.150000
--1.250000,0.375000,0.150000
--1.250000,0.375000,-0.000000
--1.350000,0.262500,-0.000000
--1.350000,0.262500,0.150000
--1.500000,0.375000,0.150000
--1.500000,0.375000,-0.000000
--1.350000,0.150000,-0.000000
--1.350000,0.150000,0.150000
--1.500000,0.150000,0.150000
--1.500000,0.150000,-0.000000
--0.750000,0.375000,-0.150000
--0.800000,0.262500,-0.150000
--1.250000,0.375000,-0.150000
--1.150000,0.262500,-0.150000
--1.500000,0.375000,-0.150000
--1.350000,0.262500,-0.150000
--1.500000,0.150000,-0.150000
--1.350000,0.150000,-0.150000
--1.350000,0.037500,-0.000000
--1.350000,0.037500,0.150000
--1.500000,-0.075000,0.150000
--1.500000,-0.075000,-0.000000
--1.250000,-0.187500,-0.000000
--1.250000,-0.187500,0.150000
--1.325000,-0.281250,0.150000
--1.325000,-0.281250,-0.000000
--1.000000,-0.300000,0.150000
--0.950000,-0.450000,0.150000
--0.950000,-0.450000,-0.000000
--1.500000,-0.075000,-0.150000
--1.350000,0.037500,-0.150000
--1.325000,-0.281250,-0.150000
--1.250000,-0.187500,-0.150000
--0.950000,-0.450000,-0.150000
--1.000000,-0.300000,-0.150000
-0.850000,-0.037500,-0.000000
-0.850000,-0.037500,0.330000
-0.850000,-0.450000,0.330000
-0.850000,-0.450000,-0.000000
-1.300000,-0.037500,-0.000000
-1.300000,-0.037500,0.330000
-1.550000,-0.337500,0.330000
-1.550000,-0.337500,-0.000000
-1.150000,0.300000,-0.000000
-1.150000,0.300000,0.125000
-1.200000,0.262500,0.125000
-1.200000,0.262500,-0.000000
-1.350000,0.450000,-0.000000
-1.350000,0.450000,0.125000
-1.650000,0.450000,0.125000
-1.650000,0.450000,-0.000000
-0.850000,-0.450000,-0.330000
-0.850000,-0.037500,-0.330000
-1.550000,-0.337500,-0.330000
-1.300000,-0.037500,-0.330000
-1.200000,0.262500,-0.125000
-1.150000,0.300000,-0.125000
-1.650000,0.450000,-0.125000
-1.350000,0.450000,-0.125000
-1.400000,0.487500,-0.000000
-1.400000,0.487500,0.125000
-1.762500,0.496875,0.125000
-1.762500,0.496875,-0.000000
-1.450000,0.487500,-0.000000
-1.450000,0.487500,0.075000
-1.725000,0.506250,0.075000
-1.725000,0.506250,-0.000000
-1.400000,0.450000,-0.000000
-1.400000,0.450000,0.075000
-1.600000,0.450000,0.075000
-1.600000,0.450000,-0.000000
-1.762500,0.496875,-0.125000
-1.400000,0.487500,-0.125000
-1.725000,0.506250,-0.075000
-1.450000,0.487500,-0.075000
-1.600000,0.450000,-0.075000
-1.400000,0.450000,-0.075000
-0.000000,0.825000,-0.000000
-0.000000,0.825000,0.001000
-0.001000,0.825000,-0.000000
-0.400000,0.825000,-0.000000
-0.400000,0.825000,0.225000
-0.225000,0.825000,0.400000
-0.000000,0.825000,0.400000
-0.000000,0.675000,-0.000000
-0.100000,0.600000,-0.000000
-0.100000,0.600000,0.056000
-0.056000,0.600000,0.100000
-0.000000,0.600000,0.100000
--0.001000,0.825000,-0.000000
--0.225000,0.825000,0.400000
--0.400000,0.825000,0.225000
--0.400000,0.825000,-0.000000
--0.056000,0.600000,0.100000
--0.100000,0.600000,0.056000
--0.100000,0.600000,-0.000000
-0.000000,0.825000,-0.001000
--0.400000,0.825000,-0.225000
--0.225000,0.825000,-0.400000
-0.000000,0.825000,-0.400000
--0.100000,0.600000,-0.056000
--0.056000,0.600000,-0.100000
-0.000000,0.600000,-0.100000
-0.225000,0.825000,-0.400000
-0.400000,0.825000,-0.225000
-0.056000,0.600000,-0.100000
-0.100000,0.600000,-0.056000
-0.200000,0.525000,-0.000000
-0.200000,0.525000,0.112000
-0.112000,0.525000,0.200000
-0.000000,0.525000,0.200000
-0.650000,0.525000,-0.000000
-0.650000,0.525000,0.364000
-0.364000,0.525000,0.650000
-0.000000,0.525000,0.650000
-0.650000,0.450000,-0.000000
-0.650000,0.450000,0.364000
-0.364000,0.450000,0.650000
-0.000000,0.450000,0.650000
--0.112000,0.525000,0.200000
--0.200000,0.525000,0.112000
--0.200000,0.525000,-0.000000
--0.364000,0.525000,0.650000
--0.650000,0.525000,0.364000
--0.650000,0.525000,-0.000000
--0.364000,0.450000,0.650000
--0.650000,0.450000,0.364000
--0.650000,0.450000,-0.000000
--0.200000,0.525000,-0.112000
--0.112000,0.525000,-0.200000
-0.000000,0.525000,-0.200000
--0.650000,0.525000,-0.364000
--0.364000,0.525000,-0.650000
-0.000000,0.525000,-0.650000
--0.650000,0.450000,-0.364000
--0.364000,0.450000,-0.650000
-0.000000,0.450000,-0.650000
-0.112000,0.525000,-0.200000
-0.200000,0.525000,-0.112000
-0.364000,0.525000,-0.650000
-0.650000,0.525000,-0.364000
-0.364000,0.450000,-0.650000
-0.650000,0.450000,-0.364000
-0.000000,-0.750000,-0.000000
-0.750000,-0.675000,-0.000000
-0.750000,-0.675000,-0.420000
-0.420000,-0.675000,-0.750000
-0.000000,-0.675000,-0.750000
-0.750000,-0.712500,-0.000000
-0.750000,-0.712500,-0.420000
-0.420000,-0.712500,-0.750000
-0.000000,-0.712500,-0.750000
-0.712500,-0.750000,-0.000000
-0.712500,-0.750000,-0.399000
-0.399000,-0.750000,-0.712500
-0.000000,-0.750000,-0.712500
--0.420000,-0.675000,-0.750000
--0.750000,-0.675000,-0.420000
--0.750000,-0.675000,-0.000000
--0.420000,-0.712500,-0.750000
--0.750000,-0.712500,-0.420000
--0.750000,-0.712500,-0.000000
--0.399000,-0.750000,-0.712500
--0.712500,-0.750000,-0.399000
--0.712500,-0.750000,-0.000000
--0.750000,-0.675000,0.420000
--0.420000,-0.675000,0.750000
-0.000000,-0.675000,0.750000
--0.750000,-0.712500,0.420000
--0.420000,-0.712500,0.750000
-0.000000,-0.712500,0.750000
--0.712500,-0.750000,0.399000
--0.399000,-0.750000,0.712500
-0.000000,-0.750000,0.712500
-0.420000,-0.675000,0.750000
-0.750000,-0.675000,0.420000
-0.420000,-0.712500,0.750000
-0.750000,-0.712500,0.420000
-0.399000,-0.750000,0.712500
-0.712500,-0.750000,0.399000
diff --git a/demos/declarative/meshes/button3d.3ds b/demos/declarative/meshes/button3d.3ds
deleted file mode 100644
index a84933f43..000000000
--- a/demos/declarative/meshes/button3d.3ds
+++ /dev/null
diff --git a/demos/declarative/meshes/full-address b/demos/declarative/meshes/full-address
deleted file mode 100644
index 8c83ac062..000000000
--- a/demos/declarative/meshes/full-address
+++ /dev/null
diff --git a/demos/declarative/meshes/photopane.obj b/demos/declarative/meshes/photopane.obj
deleted file mode 100644
index 1f5e91dfd..000000000
--- a/demos/declarative/meshes/photopane.obj
+++ /dev/null
@@ -1,11 +0,0 @@
-s 0
-v -2 -1.5 0.0
-v 2 -1.5 0.0
-v 2  1.5 0.0
-v -2  1.5 0.0
-vt 0.0 0.0
-vt 1.0 0.0
-vt 1.0 1.0
-vt 0.0 1.0
-vn 0.0 0.0 1.0
-f 1/1/1 2/2/1 3/3/1 4/4/1
diff --git a/demos/declarative/modelViewer/images/arrow.png b/demos/declarative/modelViewer/images/arrow.png
deleted file mode 100644
index 0ea53c179..000000000
--- a/demos/declarative/modelViewer/images/arrow.png
+++ /dev/null
diff --git a/demos/declarative/modelViewer/images/arrow.svg b/demos/declarative/modelViewer/images/arrow.svg
deleted file mode 100644
index 6665e81dc..000000000
--- a/demos/declarative/modelViewer/images/arrow.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="arrow.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="36.315176"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1348"
-     inkscape:window-height="684"
-     inkscape:window-x="177"
-     inkscape:window-y="346"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <rect
-       style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="970.86469"
-       x="14.027932"
-       id="image4316"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAE0AAABACAYAAABfl/puAAAABHNCSVQICAgIfAhkiAAABMxJREFU eJzt3E9MI1UcB/DvvE63zBRIydRiCIfFg1E5cMAQEmLyAuUABAH/nMzqxWyiiXL1oKd116PJHoye PKmHNcsfkWAo8kw8woUEVAIMB08wBFYYbDvlPQ9QRISWTqfTfW2/pzm89+aXT3+vM520DUCyDAwM vNja2hra3t4+LFcNpFwndhNKaVhRlO/C4fAPlNLnylWHVGg4rddwHKcjHA5/Xy442dAAAN3d3cQw jBfKBSclWlNTE8bGxrRywUmJBvwP7hGl9Fm/zi0tGnAKNzIyomma9lJ9ff3nlNIGP84rNRoAGIaB oaGhukAg8Go4HP7CDzjp0QCgra0No6Ojuqqqr/kBVxFogL9wFYMG+AcnG1o9gDpd168d4AecbGjP cM71SCSSc1Cp4WRDu3FKCVexaEDp4CoaDSgNXMWjAf/CEUJeb2ho+IhSGihmvapAA07hent76xzH Gdc07cNi4KoGDQA6OjqUvr4+TQhxrxg4FQAopbcBNHpZYInyvBBCcTuZEILOzk4CQFtYWLinaRoo pQ8ZYyeFrKNSSm/ruv4r57zJbTE+hhBCQoeHh2hubna7QNFwKoBGznnT8PCwHo1GXRXiVyzLgmEY aG5uhhACiuKu6YqFU7MH0WjU9avnV2Kx2PmxW7BsioGrqgvB5WThCr04VDUa4A6u6tGAwuFqaGe5 DKfr+t1rx/pZ2NOeLFxPT48mhPg0Ho/Hrxznd2FPewgh6OrqIu3t7Q3BYPCbq+CkQ3McB0KIkp4j FAqhv78/2N7e3nQVnHRowWCw6Hu0myQXnHRofuY6uBpanoRCIcTj8aBhGJFAIPAZpTSs5p9W3eGc Y2VlJbmzs5PMZDJfAziudVqOcM6xtLSUTCQSyUwm8zHn/CvGmKh12jVxHAdLS0upxcXFLNiX2Q/z NbQrkkqlMD8/76ysrNiZTOaTsw47f/pRQ7uULNjq6uo+5/wO53yeMfafG8Ma2oVcBHMc561EIpG4 alztQnCWm4IBtU4DcAo2Nzf3ZG1t7fjk5OTtXGBADe0cbHV19TCdTr/DGPs535yq3p5uwADJOo1z DkK8eZ0PDg6QSCQO19fXCwIDLqBZluVJMaWMZVloaWlBvu+n5cv+/j4mJib+3tnZ+TOdTr/HGPul kPkqgL8URfljbm6uAUBpH1QVnwjn3BgfHye3bt1ytUAWbG9v7/dkMvkGY2yr0DVUxtg2pfQVSPD+ pmnau7quPxBC1LmZfxHMtm1XYMDZ9mSM2W4m+53BwcGk2weQXoEBEnSXF/ESDKgCNK/BAMluOQrN 3t4epqamPAUDKhjNNE3Mzs6mj4+Pf7Nt+02vwADJtichpFFVVZHvYmCaJqanpx3O+U+2bQ95CQZI 1mmKorwci8XUXPdoWbBAIDBrWdYdxpjnfxAgVacBCObqMj/AAPnQro1pmpiamkoSQn4sJRgg2fa8 LqZpYnJy8jiTyTw+ODh4v5RgQAV02kUw27ZLDgZI3Gmcc2xubmJmZsZXMEBSNM45lpeXwRhLKYry yLbtD/wCAyTcnkIILC8vY3FxMaVp2v2jo6O7foIBEnba1taWurGxkdJ1/b5lWQ8K/bWJF5Gq04QQ IpVKnZQTDJCs0zjnDyORyLe7u7uPywUGAP8AGpq/aU97o64AAAAASUVORK5CYII= "
-       height="64"
-       width="77"
-       style="opacity:0.75" />
-  </g>
-</svg>
diff --git a/demos/declarative/modelViewer/images/cog.svg b/demos/declarative/modelViewer/images/cog.svg
deleted file mode 100644
index e8a993d31..000000000
--- a/demos/declarative/modelViewer/images/cog.svg
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="cog.svg">
-  <defs
-     id="defs4">
-    <filter
-       id="filter6134"
-       inkscape:label="Jam spread"
-       inkscape:menu="Textures"
-       inkscape:menu-tooltip="Glossy clumpy jam spread"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur6136"
-         stdDeviation="1"
-         in="SourceGraphic"
-         result="result0" />
-      <feTurbulence
-         id="feTurbulence6138"
-         result="result1"
-         numOctaves="7"
-         seed="488"
-         baseFrequency="0.017"
-         type="turbulence" />
-      <feComposite
-         id="feComposite6140"
-         in2="result1"
-         in="result0"
-         operator="out"
-         result="result2" />
-      <feGaussianBlur
-         id="feGaussianBlur6142"
-         stdDeviation="0.5"
-         result="result5" />
-      <feSpecularLighting
-         id="feSpecularLighting6144"
-         in="result5"
-         specularExponent="100"
-         specularConstant="4"
-         result="result4"
-         surfaceScale="1.5">
-        <feDistantLight
-           id="feDistantLight6146"
-           azimuth="225"
-           elevation="62" />
-      </feSpecularLighting>
-      <feComposite
-         id="feComposite6148"
-         in2="result2"
-         operator="atop"
-         in="result4"
-         result="result91" />
-      <feBlend
-         id="feBlend6150"
-         in2="result91"
-         mode="multiply" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-21.768595"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1118"
-     inkscape:window-height="684"
-     inkscape:window-x="243"
-     inkscape:window-y="161"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="opacity:0.75">
-    <rect
-       style="opacity:0.20000000000000001;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="955.81396"
-       x="2.9568648"
-       id="image4099"
-       xlink:href="data:image/png;base64,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 sc8FnQAAAABJRU5ErkJggg== "
-       height="84"
-       width="85"
-       style="opacity:0.75000000000000000;filter:url(#filter6134)" />
-  </g>
-</svg>
diff --git a/demos/declarative/modelViewer/images/cog2.svg b/demos/declarative/modelViewer/images/cog2.svg
deleted file mode 100644
index 21f25d95d..000000000
--- a/demos/declarative/modelViewer/images/cog2.svg
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="cog.svg">
-  <defs
-     id="defs4">
-    <filter
-       id="filter6134"
-       inkscape:label="Jam spread"
-       inkscape:menu="Textures"
-       inkscape:menu-tooltip="Glossy clumpy jam spread"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur6136"
-         stdDeviation="1"
-         in="SourceGraphic"
-         result="result0" />
-      <feTurbulence
-         id="feTurbulence6138"
-         result="result1"
-         numOctaves="7"
-         seed="488"
-         baseFrequency="0.017"
-         type="turbulence" />
-      <feComposite
-         id="feComposite6140"
-         in2="result1"
-         in="result0"
-         operator="out"
-         result="result2" />
-      <feGaussianBlur
-         id="feGaussianBlur6142"
-         stdDeviation="0.5"
-         result="result5" />
-      <feSpecularLighting
-         id="feSpecularLighting6144"
-         in="result5"
-         specularExponent="100"
-         specularConstant="4"
-         result="result4"
-         surfaceScale="1.5">
-        <feDistantLight
-           id="feDistantLight6146"
-           azimuth="225"
-           elevation="62" />
-      </feSpecularLighting>
-      <feComposite
-         id="feComposite6148"
-         in2="result2"
-         operator="atop"
-         in="result4"
-         result="result91" />
-      <feBlend
-         id="feBlend6150"
-         in2="result91"
-         mode="multiply" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="36.315176"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1118"
-     inkscape:window-height="684"
-     inkscape:window-x="310"
-     inkscape:window-y="375"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <rect
-       style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="955.81396"
-       x="2.9568648"
-       id="image4099"
-       xlink:href="data:image/png;base64,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 sc8FnQAAAABJRU5ErkJggg== "
-       height="84"
-       width="85"
-       style="opacity:0.75000000000000000;filter:url(#filter6134)" />
-  </g>
-</svg>
diff --git a/demos/declarative/modelViewer/images/knob.png b/demos/declarative/modelViewer/images/knob.png
deleted file mode 100644
index 0d5d8f0eb..000000000
--- a/demos/declarative/modelViewer/images/knob.png
+++ /dev/null
diff --git a/demos/declarative/modelViewer/images/knob.svg b/demos/declarative/modelViewer/images/knob.svg
deleted file mode 100644
index a14019298..000000000
--- a/demos/declarative/modelViewer/images/knob.svg
+++ /dev/null
@@ -1,867 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="52px"
-   height="52px"
-   viewBox="0 0 52 52"
-   enable-background="new 0 0 52 52"
-   xml:space="preserve"
-   id="svg3883"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docname="knob_on.svg"
-   sodipodi:docbase="/local/axel/embeddedwidgets/embeddedstories/skins/svgslideswitch/MetallicBrush"><metadata
-   id="metadata4200"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   inkscape:window-height="640"
-   inkscape:window-width="937"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   inkscape:zoom="8.3653846"
-   inkscape:cx="26.000002"
-   inkscape:cy="26"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:current-layer="svg3883" />
-<defs
-   id="defs3885">
-</defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-59.7866"
-   y1="-115.917"
-   x2="-93.2123"
-   y2="-76.0818"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#000000"
-   id="stop3888" />
-    <stop
-   offset="1"
-   style="stop-color:#EAECEF"
-   id="stop3890" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="26"
-   id="circle3892"
-   style="fill:url(#SVGID_1_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="26"
-   sodipodi:ry="26"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="-100.5"
-   y1="-96"
-   x2="-52.5"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3895" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3897" />
-    <stop
-   offset="0.6043"
-   style="stop-color:#E7EAED"
-   id="stop3899" />
-    <stop
-   offset="0.6751"
-   style="stop-color:#DEE4E7"
-   id="stop3901" />
-    <stop
-   offset="0.7358"
-   style="stop-color:#CFD9DD"
-   id="stop3903" />
-    <stop
-   offset="0.791"
-   style="stop-color:#B9CACF"
-   id="stop3905" />
-    <stop
-   offset="0.8425"
-   style="stop-color:#9EB6BD"
-   id="stop3907" />
-    <stop
-   offset="0.891"
-   style="stop-color:#7B9EA7"
-   id="stop3909" />
-    <stop
-   offset="0.9374"
-   style="stop-color:#53828C"
-   id="stop3911" />
-    <stop
-   offset="0.9809"
-   style="stop-color:#25626E"
-   id="stop3913" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3915" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="24"
-   id="circle3917"
-   style="fill:url(#SVGID_2_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="24"
-   sodipodi:ry="24"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_3_"
-   gradientUnits="userSpaceOnUse"
-   x1="-98.6328"
-   y1="-96"
-   x2="-54.3672"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3920" />
-    <stop
-   offset="0.073"
-   style="stop-color:#8FAECB"
-   id="stop3922" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3924" />
-    <stop
-   offset="0.5902"
-   style="stop-color:#E7E9ED"
-   id="stop3926" />
-    <stop
-   offset="0.618"
-   style="stop-color:#E4E7EB"
-   id="stop3928" />
-    <stop
-   offset="0.6697"
-   style="stop-color:#E0E4E9"
-   id="stop3930" />
-    <stop
-   offset="0.7211"
-   style="stop-color:#D4DCE1"
-   id="stop3932" />
-    <stop
-   offset="0.7722"
-   style="stop-color:#C0CFD5"
-   id="stop3934" />
-    <stop
-   offset="0.809"
-   style="stop-color:#ADC2C9"
-   id="stop3936" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3938" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="22.132999"
-   id="circle3940"
-   style="fill:url(#SVGID_3_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="22.132999"
-   sodipodi:ry="22.132999"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_4_"
-   gradientUnits="userSpaceOnUse"
-   x1="-96.7671"
-   y1="-96"
-   x2="-56.2324"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3943" />
-    <stop
-   offset="0.073"
-   style="stop-color:#86A7C4"
-   id="stop3945" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3947" />
-    <stop
-   offset="0.577"
-   style="stop-color:#E7EAED"
-   id="stop3949" />
-    <stop
-   offset="0.618"
-   style="stop-color:#E1E6EA"
-   id="stop3951" />
-    <stop
-   offset="0.6697"
-   style="stop-color:#DDE3E8"
-   id="stop3953" />
-    <stop
-   offset="0.7211"
-   style="stop-color:#D1DBE1"
-   id="stop3955" />
-    <stop
-   offset="0.7722"
-   style="stop-color:#BDCDD5"
-   id="stop3957" />
-    <stop
-   offset="0.809"
-   style="stop-color:#AAC0CA"
-   id="stop3959" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3961" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="20.267"
-   id="circle3963"
-   style="fill:url(#SVGID_4_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="20.267"
-   sodipodi:ry="20.267"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_5_"
-   gradientUnits="userSpaceOnUse"
-   x1="-94.8999"
-   y1="-96"
-   x2="-58.0996"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3966" />
-    <stop
-   offset="0.073"
-   style="stop-color:#7E9FBC"
-   id="stop3968" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3970" />
-    <stop
-   offset="0.5709"
-   style="stop-color:#E6E9ED"
-   id="stop3972" />
-    <stop
-   offset="0.618"
-   style="stop-color:#DFE4E9"
-   id="stop3974" />
-    <stop
-   offset="0.6687"
-   style="stop-color:#DBE1E7"
-   id="stop3976" />
-    <stop
-   offset="0.7193"
-   style="stop-color:#CFD9E0"
-   id="stop3978" />
-    <stop
-   offset="0.7695"
-   style="stop-color:#BBCCD6"
-   id="stop3980" />
-    <stop
-   offset="0.809"
-   style="stop-color:#A6BECA"
-   id="stop3982" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3984" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="18.4"
-   id="circle3986"
-   style="fill:url(#SVGID_5_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="18.4"
-   sodipodi:ry="18.4"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_6_"
-   gradientUnits="userSpaceOnUse"
-   x1="-93.0332"
-   y1="-96"
-   x2="-59.9668"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3989" />
-    <stop
-   offset="0.073"
-   style="stop-color:#7697B4"
-   id="stop3991" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3993" />
-    <stop
-   offset="0.5636"
-   style="stop-color:#E6E9ED"
-   id="stop3995" />
-    <stop
-   offset="0.618"
-   style="stop-color:#DCE2E8"
-   id="stop3997" />
-    <stop
-   offset="0.6687"
-   style="stop-color:#D8DFE6"
-   id="stop3999" />
-    <stop
-   offset="0.7193"
-   style="stop-color:#CCD7E0"
-   id="stop4001" />
-    <stop
-   offset="0.7695"
-   style="stop-color:#B8CAD5"
-   id="stop4003" />
-    <stop
-   offset="0.809"
-   style="stop-color:#A3BCCA"
-   id="stop4005" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4007" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="16.533001"
-   id="circle4009"
-   style="fill:url(#SVGID_6_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="16.533001"
-   sodipodi:ry="16.533001"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_7_"
-   gradientUnits="userSpaceOnUse"
-   x1="-91.167"
-   y1="-96"
-   x2="-61.833"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4012" />
-    <stop
-   offset="0.073"
-   style="stop-color:#6D8FAD"
-   id="stop4014" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4016" />
-    <stop
-   offset="0.5605"
-   style="stop-color:#E5E8EC"
-   id="stop4018" />
-    <stop
-   offset="0.618"
-   style="stop-color:#DAE1E7"
-   id="stop4020" />
-    <stop
-   offset="0.6679"
-   style="stop-color:#D6DEE5"
-   id="stop4022" />
-    <stop
-   offset="0.7175"
-   style="stop-color:#CAD6DF"
-   id="stop4024" />
-    <stop
-   offset="0.7669"
-   style="stop-color:#B6C9D6"
-   id="stop4026" />
-    <stop
-   offset="0.809"
-   style="stop-color:#9FBACB"
-   id="stop4028" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4030" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="14.667"
-   id="circle4032"
-   style="fill:url(#SVGID_7_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="14.667"
-   sodipodi:ry="14.667"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_8_"
-   gradientUnits="userSpaceOnUse"
-   x1="-89.2998"
-   y1="-96"
-   x2="-63.7002"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4035" />
-    <stop
-   offset="0.073"
-   style="stop-color:#6587A5"
-   id="stop4037" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4039" />
-    <stop
-   offset="0.5588"
-   style="stop-color:#E4E8EC"
-   id="stop4041" />
-    <stop
-   offset="0.618"
-   style="stop-color:#D8DFE7"
-   id="stop4043" />
-    <stop
-   offset="0.6675"
-   style="stop-color:#D4DCE5"
-   id="stop4045" />
-    <stop
-   offset="0.7167"
-   style="stop-color:#C8D5E0"
-   id="stop4047" />
-    <stop
-   offset="0.7657"
-   style="stop-color:#B4C8D6"
-   id="stop4049" />
-    <stop
-   offset="0.809"
-   style="stop-color:#9CB8CB"
-   id="stop4051" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4053" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="12.8"
-   id="circle4055"
-   style="fill:url(#SVGID_8_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="12.8"
-   sodipodi:ry="12.8"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_9_"
-   gradientUnits="userSpaceOnUse"
-   x1="-87.4331"
-   y1="-96"
-   x2="-65.5664"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4058" />
-    <stop
-   offset="0.073"
-   style="stop-color:#5D809D"
-   id="stop4060" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4062" />
-    <stop
-   offset="0.5567"
-   style="stop-color:#E3E7EC"
-   id="stop4064" />
-    <stop
-   offset="0.618"
-   style="stop-color:#D5DDE6"
-   id="stop4066" />
-    <stop
-   offset="0.6671"
-   style="stop-color:#D1DAE4"
-   id="stop4068" />
-    <stop
-   offset="0.7159"
-   style="stop-color:#C5D3DF"
-   id="stop4070" />
-    <stop
-   offset="0.7645"
-   style="stop-color:#B1C6D6"
-   id="stop4072" />
-    <stop
-   offset="0.809"
-   style="stop-color:#98B5CB"
-   id="stop4074" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4076" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="10.933"
-   id="circle4078"
-   style="fill:url(#SVGID_9_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="10.933"
-   sodipodi:ry="10.933"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_10_"
-   gradientUnits="userSpaceOnUse"
-   x1="-85.5659"
-   y1="-96"
-   x2="-67.4336"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4081" />
-    <stop
-   offset="0.073"
-   style="stop-color:#547896"
-   id="stop4083" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4085" />
-    <stop
-   offset="0.5588"
-   style="stop-color:#E1E6EB"
-   id="stop4087" />
-    <stop
-   offset="0.618"
-   style="stop-color:#D3DCE5"
-   id="stop4089" />
-    <stop
-   offset="0.6663"
-   style="stop-color:#CFD9E3"
-   id="stop4091" />
-    <stop
-   offset="0.7143"
-   style="stop-color:#C3D2DF"
-   id="stop4093" />
-    <stop
-   offset="0.7621"
-   style="stop-color:#AFC5D7"
-   id="stop4095" />
-    <stop
-   offset="0.809"
-   style="stop-color:#94B3CC"
-   id="stop4097" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4099" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="9.066"
-   id="circle4101"
-   style="fill:url(#SVGID_10_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="9.066"
-   sodipodi:ry="9.066"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_11_"
-   gradientUnits="userSpaceOnUse"
-   x1="-83.7002"
-   y1="-96"
-   x2="-69.2998"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4104" />
-    <stop
-   offset="0.073"
-   style="stop-color:#4C708E"
-   id="stop4106" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4108" />
-    <stop
-   offset="0.5625"
-   style="stop-color:#DEE4EA"
-   id="stop4110" />
-    <stop
-   offset="0.618"
-   style="stop-color:#D0DAE4"
-   id="stop4112" />
-    <stop
-   offset="0.6663"
-   style="stop-color:#CCD7E2"
-   id="stop4114" />
-    <stop
-   offset="0.7143"
-   style="stop-color:#C0D0DE"
-   id="stop4116" />
-    <stop
-   offset="0.7621"
-   style="stop-color:#ACC3D6"
-   id="stop4118" />
-    <stop
-   offset="0.809"
-   style="stop-color:#91B1CC"
-   id="stop4120" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4122" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="7.1999998"
-   id="circle4124"
-   style="fill:url(#SVGID_11_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="7.1999998"
-   sodipodi:ry="7.1999998"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_12_"
-   gradientUnits="userSpaceOnUse"
-   x1="-81.833"
-   y1="-96"
-   x2="-71.167"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4127" />
-    <stop
-   offset="0.073"
-   style="stop-color:#446986"
-   id="stop4129" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4131" />
-    <stop
-   offset="0.5757"
-   style="stop-color:#D9E0E8"
-   id="stop4133" />
-    <stop
-   offset="0.618"
-   style="stop-color:#CED8E3"
-   id="stop4135" />
-    <stop
-   offset="0.6655"
-   style="stop-color:#CAD5E2"
-   id="stop4137" />
-    <stop
-   offset="0.7129"
-   style="stop-color:#BECEDD"
-   id="stop4139" />
-    <stop
-   offset="0.7601"
-   style="stop-color:#AAC1D6"
-   id="stop4141" />
-    <stop
-   offset="0.807"
-   style="stop-color:#8EB0CC"
-   id="stop4143" />
-    <stop
-   offset="0.809"
-   style="stop-color:#8DAFCC"
-   id="stop4145" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4147" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="5.3330002"
-   id="circle4149"
-   style="fill:url(#SVGID_12_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="5.3330002"
-   sodipodi:ry="5.3330002"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_13_"
-   gradientUnits="userSpaceOnUse"
-   x1="-79.9658"
-   y1="-96"
-   x2="-73.0342"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4152" />
-    <stop
-   offset="0.073"
-   style="stop-color:#3B617F"
-   id="stop4154" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4156" />
-    <stop
-   offset="0.6087"
-   style="stop-color:#CED9E3"
-   id="stop4158" />
-    <stop
-   offset="0.618"
-   style="stop-color:#CBD7E2"
-   id="stop4160" />
-    <stop
-   offset="0.6655"
-   style="stop-color:#C7D4E1"
-   id="stop4162" />
-    <stop
-   offset="0.7129"
-   style="stop-color:#BBCDDD"
-   id="stop4164" />
-    <stop
-   offset="0.7601"
-   style="stop-color:#A7C0D6"
-   id="stop4166" />
-    <stop
-   offset="0.807"
-   style="stop-color:#8BAECD"
-   id="stop4168" />
-    <stop
-   offset="0.809"
-   style="stop-color:#8AADCD"
-   id="stop4170" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4172" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="3.4660001"
-   id="circle4174"
-   style="fill:url(#SVGID_13_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="3.4660001"
-   sodipodi:ry="3.4660001"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_14_"
-   gradientUnits="userSpaceOnUse"
-   x1="-78.1001"
-   y1="-96"
-   x2="-74.9004"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-    <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4177" />
-    <stop
-   offset="0.073"
-   style="stop-color:#335977"
-   id="stop4179" />
-    <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4181" />
-    <stop
-   offset="0.618"
-   style="stop-color:#C9D5E1"
-   id="stop4183" />
-    <stop
-   offset="0.6648"
-   style="stop-color:#C5D3E0"
-   id="stop4185" />
-    <stop
-   offset="0.7114"
-   style="stop-color:#B9CBDC"
-   id="stop4187" />
-    <stop
-   offset="0.758"
-   style="stop-color:#A5BFD6"
-   id="stop4189" />
-    <stop
-   offset="0.8042"
-   style="stop-color:#89ADCE"
-   id="stop4191" />
-    <stop
-   offset="0.809"
-   style="stop-color:#86ABCD"
-   id="stop4193" />
-    <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4195" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="1.6"
-   id="circle4197"
-   style="fill:url(#SVGID_14_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="1.6"
-   sodipodi:ry="1.6"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-</svg>
diff --git a/demos/declarative/modelViewer/images/test.svg b/demos/declarative/modelViewer/images/test.svg
deleted file mode 100644
index 6d51cc9e7..000000000
--- a/demos/declarative/modelViewer/images/test.svg
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="test.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="114.34946"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1118"
-     inkscape:window-height="684"
-     inkscape:window-x="465"
-     inkscape:window-y="406"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <rect
-       style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="952.36218"
-       x="0.173319"
-       id="image3901"
-       xlink:href="data:image/png;base64,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
-RU5ErkJggg==
-"
-       height="100"
-       width="100" />
-  </g>
-</svg>
diff --git a/demos/declarative/modelViewer/images/zoomin.png b/demos/declarative/modelViewer/images/zoomin.png
deleted file mode 100644
index b17cbe81d..000000000
--- a/demos/declarative/modelViewer/images/zoomin.png
+++ /dev/null
diff --git a/demos/declarative/modelViewer/images/zoomin.svg b/demos/declarative/modelViewer/images/zoomin.svg
deleted file mode 100644
index d517e3e5d..000000000
--- a/demos/declarative/modelViewer/images/zoomin.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="zoomin.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="36.315176"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1118"
-     inkscape:window-height="684"
-     inkscape:window-x="465"
-     inkscape:window-y="406"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <rect
-       style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="957.90533"
-       x="7.5177755"
-       id="image4088"
-       xlink:href="data:image/png;base64,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 YII= "
-       height="98"
-       width="88"
-       style="opacity:0.75" />
-  </g>
-</svg>
diff --git a/demos/declarative/modelViewer/images/zoomout.png b/demos/declarative/modelViewer/images/zoomout.png
deleted file mode 100644
index 01ed6f25d..000000000
--- a/demos/declarative/modelViewer/images/zoomout.png
+++ /dev/null
diff --git a/demos/declarative/modelViewer/images/zoomout.svg b/demos/declarative/modelViewer/images/zoomout.svg
deleted file mode 100644
index ab722c1b6..000000000
--- a/demos/declarative/modelViewer/images/zoomout.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47+devel r9541"
-   sodipodi:docname="zoomout.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="114.34946"
-     inkscape:cy="49.177003"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1118"
-     inkscape:window-height="684"
-     inkscape:window-x="465"
-     inkscape:window-y="406"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <rect
-       style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2993"
-       width="100"
-       height="100"
-       x="0.16797371"
-       y="952.60327"
-       rx="15"
-       ry="15" />
-    <image
-       y="962.42053"
-       x="-2.5685232"
-       id="image4305"
-       xlink:href="data:image/png;base64,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
-kIVqMoUAAAAASUVORK5CYII=
-"
-       height="92"
-       width="91"
-       style="opacity:0.75" />
-  </g>
-</svg>
diff --git a/demos/declarative/monkeygod/monkeygod.qmlproject b/demos/declarative/monkeygod/monkeygod.qmlproject
deleted file mode 100644
index d4909f868..000000000
--- a/demos/declarative/monkeygod/monkeygod.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/demos/declarative/stereo/Teapot.qml b/demos/declarative/stereo/Teapot.qml
deleted file mode 100644
index 572cc3ec1..000000000
--- a/demos/declarative/stereo/Teapot.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-import Qt3D 1.0
-
-Item3D {
-    id: teapot
-    mesh: Mesh { source: "../meshes/teapot.bez" }
-    effect: Effect {
-        material: Material {
-            id: china
-            ambientColor: "#c09680"
-            specularColor: "#3c3c3c"
-            shininess: 128
-        }
-    }
-}
diff --git a/demos/declarative/stereo/Time.qml b/demos/declarative/stereo/Time.qml
deleted file mode 100644
index c29568c64..000000000
--- a/demos/declarative/stereo/Time.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-
-Item {
-    id: container
-    property variant currentDateTime
-
-    Rectangle {
-        anchors.fill: parent
-        border.color: "black"
-        radius: 5
-    }
-
-    width: 150
-    height: 50
-
-    Text {
-        text: Qt.formatTime(container.currentDateTime, "h:mm'<sup><small> 'ap'</small></sup>'")
-        font.pixelSize: 30; font.bold: true
-        color: "black"
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-    }
-
-    Timer {
-        interval: 1000
-        running: true
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: container.currentDateTime = new Date()
-    }
-}
diff --git a/demos/declarative/stereo/Time20.qml b/demos/declarative/stereo/Time20.qml
deleted file mode 100644
index 98ad69e3d..000000000
--- a/demos/declarative/stereo/Time20.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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: container
-    property variant currentDateTime
-
-    Rectangle {
-        anchors.fill: parent
-        border.color: "black"
-        radius: 5
-    }
-
-    width: 150
-    height: 50
-
-    Text {
-        text: Qt.formatTime(container.currentDateTime, "h:mm'<sup><small> 'ap'</small></sup>'")
-        font.pixelSize: 30; font.bold: true
-        color: "black"
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-    }
-
-    Timer {
-        interval: 1000
-        running: true
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: container.currentDateTime = new Date()
-    }
-}
diff --git a/demos/declarative/stereo/stereo-scenegraph.qml b/demos/declarative/stereo/stereo-scenegraph.qml
deleted file mode 100644
index 1f41819cf..000000000
--- a/demos/declarative/stereo/stereo-scenegraph.qml
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt3D 2.0
-import Qt3D.Shapes 1.0
-
-Item {
-    id: stereo
-    width: 640; height: 450
-
-    FloatingItem {
-        anchors.fill: parent
-        depth: -10
-        Image {
-            anchors.fill: parent
-            source: "../textures/photos/niagara_falls.jpg"
-        }
-    }
-
-    Viewport {
-        anchors.fill: parent
-        navigation: false
-
-        camera: Camera {
-            eye: Qt.vector3d(0, 0, 10)
-            eyeSeparation: 0.08
-        }
-
-        Teapot {
-            id: teapot
-            position: Qt.vector3d(-1.0, -1.0, -5.0)
-
-            SequentialAnimation on y {
-                running: true
-                loops: Animation.Infinite
-                PauseAnimation { duration: 500 }
-                NumberAnimation { to : 1.0; duration: 300; easing.type:"OutQuad" }
-                NumberAnimation { to : -1.0; duration: 300; easing.type:"OutBounce" }
-            }
-        }
-
-        Cube {
-            id: cube
-            position: Qt.vector3d(1.0, -0.5, 0.0)
-
-            transform: Rotation3D {
-                axis: Qt.vector3d(1, 1, 1)
-
-                NumberAnimation on angle {
-                    running: true
-                    loops: Animation.Infinite
-                    from: 0
-                    to: 360
-                    duration: 5000
-                }
-            }
-
-            effect: Effect {
-                color: "#aaca00"
-                texture: "../textures/qtlogo.png"
-                decal: true
-            }
-        }
-    }
-
-    Time20 { x: 5; y: 5 }
-
-    FloatingItem {
-        id: button
-        x: 250; y: 50
-        width: 300; height: 80
-        depth: 4
-
-        Rectangle {
-            anchors.fill: parent
-            color: "#90e020"
-            opacity: 0.7
-            radius: 5
-        }
-
-        Text {
-            anchors.centerIn: parent
-            color: "black"
-            font.pointSize: 14
-            text: "Drag Me!"
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            drag.target: button
-            drag.axis: Drag.XandYAxis
-            drag.minimumX: 0
-            drag.maximumX: stereo.width - parent.width
-            drag.minimumY: 0
-            drag.maximumY: stereo.height - parent.height
-        }
-    }
-}
diff --git a/demos/declarative/stereo/stereo.qml b/demos/declarative/stereo/stereo.qml
deleted file mode 100644
index 3d550ff06..000000000
--- a/demos/declarative/stereo/stereo.qml
+++ /dev/null
@@ -1,165 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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$
-**
-****************************************************************************/
-
-//![1]
-import Qt 4.7
-import Qt3D 1.0
-import Qt3D.Shapes 1.0
-
-//![3]
-StereoView {
-    id: stereo
-//![3]
-    width: 640; height: 450
-//![1]
-
-/*
-//![4]
-    width: 1280; height: 450
-    layout: StereoView.LeftRight
-//![4]
-*/
-
-//![5]
-    FloatingItem {
-        anchors.fill: parent
-        depth: -10
-        Image {
-            anchors.fill: parent
-            source: "../textures/photos/niagara_falls.jpg"
-        }
-    }
-//![5]
-
-//![6]
-    Viewport {
-        anchors.fill: parent
-        navigation: false
-
-        camera: Camera {
-            eye: Qt.vector3d(0, 0, 10)
-            eyeSeparation: 0.08
-        }
-//![6]
-
-//![8]
-        Teapot {
-            id: teapot
-            position: Qt.vector3d(-1.0, -1.0, -5.0)
-//![8]
-
-            SequentialAnimation on y {
-                running: true
-                loops: Animation.Infinite
-                PauseAnimation { duration: 500 }
-                NumberAnimation { to : 1.0; duration: 300; easing.type:"OutQuad" }
-                NumberAnimation { to : -1.0; duration: 300; easing.type:"OutBounce" }
-            }
-//![9]
-        }
-
-        Cube {
-            id: cube
-            position: Qt.vector3d(1.0, -0.5, 0.0)
-//![9]
-
-            transform: Rotation3D {
-                axis: Qt.vector3d(1, 1, 1)
-
-                NumberAnimation on angle {
-                    running: true
-                    loops: Animation.Infinite
-                    from: 0
-                    to: 360
-                    duration: 5000
-                }
-            }
-
-            effect: Effect {
-                color: "#aaca00"
-                texture: "../textures/qtlogo.png"
-                decal: true
-            }
-//![10]
-        }
-//![10]
-//![7]
-    }
-//![7]
-
-//![11]
-    Time { x: 5; y: 5 }
-//![11]
-
-//![12]
-    FloatingItem {
-        id: button
-        x: 250; y: 50
-        width: 300; height: 80
-        depth: 4
-
-        Rectangle {
-            anchors.fill: parent
-            color: "#90e020"
-            opacity: 0.7
-            radius: 5
-        }
-
-        Text {
-            anchors.centerIn: parent
-            color: "black"
-            font.pointSize: 14
-            text: "Drag Me!"
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            drag.target: button
-            drag.axis: Drag.XandYAxis
-            drag.minimumX: 0
-            drag.maximumX: stereo.viewport.width - parent.width
-            drag.minimumY: 0
-            drag.maximumY: stereo.viewport.height - parent.height
-        }
-    }
-//![12]
-//![2]
-}
-//![2]
diff --git a/demos/declarative/stereo/stereo.qmlproject b/demos/declarative/stereo/stereo.qmlproject
deleted file mode 100644
index d4909f868..000000000
--- a/demos/declarative/stereo/stereo.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/demos/declarative/teapot-scenegraph.qml b/demos/declarative/teapot-scenegraph.qml
deleted file mode 100644
index c4e1c146e..000000000
--- a/demos/declarative/teapot-scenegraph.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt3D 2.0
-
-Viewport {
-    width: 640; height: 480
-    Item3D {
-        mesh: Mesh { source: "meshes/teapot.bez" }
-        effect: Effect {}
-    }
-}
diff --git a/demos/declarative/teapot-shader-animation.qml b/demos/declarative/teapot-shader-animation.qml
deleted file mode 100644
index 0d01113fc..000000000
--- a/demos/declarative/teapot-shader-animation.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
-    width: 640; height: 480
-
-Item3D {
-    mesh: Mesh { source: "meshes/teapot.bez" }
-    effect: program
-
-    transform: Rotation3D {
-        NumberAnimation on angle{
-            running: true
-            loops: Animation.Infinite
-            from: 0
-            to: 360
-            duration: 18000
-        }
-        axis: Qt.vector3d(1, -0.3, 0)
-    }
-
-    ShaderProgram {
-        id: program
-        property real qt_Custom : 1.0
-        SequentialAnimation on qt_Custom {
-            running: true
-            loops: Animation.Infinite
-            PauseAnimation { duration: 700 }
-            NumberAnimation { from: 1.0; to: 0.001; duration: 1500; easing.type:"OutBounce" }
-            PauseAnimation { duration: 700 }
-            NumberAnimation { from: 0.001; to: 1.0; duration: 1500; easing.type:"OutBounce" }
-        }
-
-        texture: "textures/qtlogo.png"
-
-        SequentialAnimation on color{
-            running: true
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "#00008a"
-                to: "#003333"
-                duration: 5000
-            }
-            ColorAnimation {
-                from: "#003333"
-                to: "#00008a"
-                duration: 5000
-            }
-        }
-
-        vertexShader: "
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec4 qt_MultiTexCoord0;
-            uniform mediump mat4 qt_ModelViewProjectionMatrix;
-            varying highp vec4 texCoord;
-            uniform highp float qt_Custom;
-
-            void main(void)
-            {
-                gl_Position = qt_ModelViewProjectionMatrix * (qt_Vertex *
-                                   vec4(1.0, qt_Custom, 1.0, 1.0));
-                texCoord =  -qt_MultiTexCoord0 + vec4(qt_Custom, 0.0, 0.0, 0.0);
-
-            }
-        "
-        fragmentShader: "
-            varying highp vec4 texCoord;
-            uniform sampler2D qt_Texture0;
-            uniform mediump vec4 qt_Color;
-
-            void main(void)
-            {
-                mediump vec4 col = texture2D(qt_Texture0, texCoord.st);
-                gl_FragColor = vec4(clamp(qt_Color.rgb * (1.0 - col.a) +
-                                          col.rgb, 0.0, 1.0), 1.0);
-            }
-        "
-    }
-}
-
-}
diff --git a/demos/declarative/teapot-shader-collapsing.qml b/demos/declarative/teapot-shader-collapsing.qml
deleted file mode 100644
index 1ee799885..000000000
--- a/demos/declarative/teapot-shader-collapsing.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
-    width: 640; height: 480
-
-Item3D {
-    mesh: Mesh { source: "meshes/teapot.bez" }
-    effect: program
-
-    transform: Rotation3D {
-        NumberAnimation on angle{
-            running: true
-            loops: Animation.Infinite
-            from: 0
-            to: 360
-            duration: 8000
-        }
-        axis: Qt.vector3d(1, -0.3, 0)
-    }
-
-    ShaderProgram {
-        id: program
-        property real collapseFactor : 0.0
-
-        SequentialAnimation on collapseFactor {
-            running: true
-            loops: Animation.Infinite
-            PauseAnimation { duration: 700 }
-            NumberAnimation { from: 0.0; to: 1.0; duration: 1500; easing.type:"OutBounce" }
-            PauseAnimation { duration: 700 }
-            NumberAnimation { from: 1.0; to: 0.0; duration: 1500; easing.type:"OutBounce" }
-        }
-        texture: "textures/qtlogo.png"
-
-        SequentialAnimation on color{
-            running: true
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "#00008a"
-                to: "#003333"
-                duration: 5000
-            }
-            ColorAnimation {
-                from: "#003333"
-                to: "#00008a"
-                duration: 5000
-            }
-        }
-
-        vertexShader: "
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec4 qt_MultiTexCoord0;
-            uniform mediump mat4 qt_ModelViewProjectionMatrix;
-            varying highp vec4 texCoord;
-            uniform highp float collapseFactor;
-
-            void main(void)
-            {
-                // Interpolate between the actual position of the input vertex
-                // and treating the tex-coordinates as vertex positions to
-                // create a neat collapsing effect.
-                vec4 workingPosition = mix( qt_Vertex, vec4(-qt_MultiTexCoord0.xyz, 1.0) , collapseFactor);
-                gl_Position = qt_ModelViewProjectionMatrix * workingPosition;
-                texCoord =  -qt_MultiTexCoord0;
-            }
-        "
-        fragmentShader: "
-            varying highp vec4 texCoord;
-            uniform sampler2D qt_Texture0;
-            uniform mediump vec4 qt_Color;
-
-            void main(void)
-            {
-                mediump vec4 col = texture2D(qt_Texture0, texCoord.st);
-                gl_FragColor = vec4(clamp(qt_Color.rgb * (1.0 - col.a) +
-                                          col.rgb, 0.0, 1.0), 1.0);
-            }
-        "
-        }
-    }
-}
diff --git a/demos/declarative/teapot-shader.qml b/demos/declarative/teapot-shader.qml
deleted file mode 100644
index 202a04103..000000000
--- a/demos/declarative/teapot-shader.qml
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
-    width: 640; height: 480
-
-Item3D {
-    mesh: Mesh { source: "meshes/teapot.bez" }
-    effect: program
-
-    transform: Rotation3D {
-        NumberAnimation on angle{
-            running: true
-            loops: Animation.Infinite
-            from: 0
-            to: 360
-            duration: 5000
-        }
-        axis: Qt.vector3d(1, -0.3, 0)
-    }
-
-    ShaderProgram {
-        id: program
-        texture: "textures/basket.jpg"
-        property variant texture2 : "textures/qtlogo.png"
-        property real interpolationFactor : 1.0
-
-        SequentialAnimation on interpolationFactor {
-            running: true
-            loops: Animation.Infinite
-            NumberAnimation { to : 1.0; duration: 750; }
-
-
-            PauseAnimation { duration: 550 }
-            NumberAnimation { to : 0.0; duration: 750; }
-            PauseAnimation { duration: 550 }
-        }
-
-        SequentialAnimation on color{
-            running: true
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "#aaca00"
-                to: "#0033ca"
-                duration: 500
-            }
-            ColorAnimation {
-                from: "#0033ca"
-                to: "#aaca00"
-                duration: 500
-            }
-        }
-
-        vertexShader: "
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec4 qt_MultiTexCoord0;
-            uniform mediump mat4 qt_ModelViewProjectionMatrix;
-            varying highp vec4 texCoord;
-
-            void main(void)
-            {
-                gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
-                texCoord = qt_MultiTexCoord0;
-            }
-        "
-        fragmentShader: "
-            varying highp vec4 texCoord;
-            uniform sampler2D qt_Texture0;
-            uniform sampler2D texture2;
-            uniform mediump vec4 qt_Color;
-            uniform mediump float interpolationFactor;
-
-            void main(void)
-            {
-                mediump vec4 col1 = texture2D(qt_Texture0, texCoord.st);
-                mediump vec4 col2 = texture2D(texture2, texCoord.st);
-                gl_FragColor = mix(col1, col2, interpolationFactor);
-            }
-        "
-    }
-}
-
-}
diff --git a/demos/declarative/textures/button/face.png b/demos/declarative/textures/button/face.png
deleted file mode 100644
index 327c88423..000000000
--- a/demos/declarative/textures/button/face.png
+++ /dev/null
diff --git a/demos/demos.pro b/demos/demos.pro
index d506a9909..c56631066 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = teaservice shapes pageflip photobrowser3d cubehouse
+SUBDIRS = quick3d qt3d
diff --git a/demos/qt3d/README b/demos/qt3d/README
new file mode 100644
index 000000000..9188d92d5
--- /dev/null
+++ b/demos/qt3d/README
@@ -0,0 +1,14 @@
+This directory contains demos for the Qt3D C++ API.
+
+Qt3D can be used to extend Qt Quick3D with custom 3D items.  Qt3D is also
+a general 3D toolkit, featuring a scenegraph API, support for OpenGL VBO's
+and other utilities for general 3D programming.
+
+Research work on Qt3D also continues in the labs repository:
+
+  http://qt.gitorious.org/qt-labs/qt3d
+
+...and is from time to time ported into Qt Quick3D.
+
+Check the labs version of Qt3D for additional cutting edge features such as
+support for stereoscopic hardware.
diff --git a/demos/cubehouse/cube.qrc b/demos/qt3d/cubehouse/cube.qrc
index 9de1d255c..9de1d255c 100644
--- a/demos/cubehouse/cube.qrc
+++ b/demos/qt3d/cubehouse/cube.qrc
diff --git a/demos/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 70ee226aa..70ee226aa 100644
--- a/demos/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
diff --git a/demos/cubehouse/cubeview.cpp b/demos/qt3d/cubehouse/cubeview.cpp
index 13933f957..13933f957 100644
--- a/demos/cubehouse/cubeview.cpp
+++ b/demos/qt3d/cubehouse/cubeview.cpp
diff --git a/demos/cubehouse/cubeview.h b/demos/qt3d/cubehouse/cubeview.h
index b9e25a20b..b9e25a20b 100644
--- a/demos/cubehouse/cubeview.h
+++ b/demos/qt3d/cubehouse/cubeview.h
diff --git a/demos/cubehouse/main.cpp b/demos/qt3d/cubehouse/main.cpp
index 29326a535..29326a535 100644
--- a/demos/cubehouse/main.cpp
+++ b/demos/qt3d/cubehouse/main.cpp
diff --git a/demos/cubehouse/projectivetextureeffect.cpp b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
index 6e69a2ebb..6e69a2ebb 100644
--- a/demos/cubehouse/projectivetextureeffect.cpp
+++ b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
diff --git a/demos/cubehouse/projectivetextureeffect.h b/demos/qt3d/cubehouse/projectivetextureeffect.h
index eb000e68a..eb000e68a 100644
--- a/demos/cubehouse/projectivetextureeffect.h
+++ b/demos/qt3d/cubehouse/projectivetextureeffect.h
diff --git a/demos/cubehouse/qtlogo.png b/demos/qt3d/cubehouse/qtlogo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/demos/cubehouse/qtlogo.png
+++ b/demos/qt3d/cubehouse/qtlogo.png
diff --git a/demos/cubehouse/shaders/depth.frag b/demos/qt3d/cubehouse/shaders/depth.frag
index 939cfc954..939cfc954 100644
--- a/demos/cubehouse/shaders/depth.frag
+++ b/demos/qt3d/cubehouse/shaders/depth.frag
diff --git a/demos/cubehouse/shaders/depth.vert b/demos/qt3d/cubehouse/shaders/depth.vert
index 8e13193b9..8e13193b9 100644
--- a/demos/cubehouse/shaders/depth.vert
+++ b/demos/qt3d/cubehouse/shaders/depth.vert
diff --git a/demos/cubehouse/shaders/depthTestShader.frag b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
index b2c6957b1..b2c6957b1 100644
--- a/demos/cubehouse/shaders/depthTestShader.frag
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
diff --git a/demos/cubehouse/shaders/depthTestShader.vert b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
index 6f640c875..6f640c875 100644
--- a/demos/cubehouse/shaders/depthTestShader.vert
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
diff --git a/demos/cubehouse/shaders/objectlineartexgen.frag b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
index a4439f28a..a4439f28a 100644
--- a/demos/cubehouse/shaders/objectlineartexgen.frag
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
diff --git a/demos/cubehouse/shaders/objectlineartexgen.vert b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
index b78b938c5..b78b938c5 100644
--- a/demos/cubehouse/shaders/objectlineartexgen.vert
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
diff --git a/demos/pageflip/gradient.png b/demos/qt3d/pageflip/gradient.png
index ddadf69d2..ddadf69d2 100644
--- a/demos/pageflip/gradient.png
+++ b/demos/qt3d/pageflip/gradient.png
diff --git a/demos/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp
index 5e5768843..5e5768843 100644
--- a/demos/pageflip/pageflip.cpp
+++ b/demos/qt3d/pageflip/pageflip.cpp
diff --git a/demos/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 4d94c8e8c..4d94c8e8c 100644
--- a/demos/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
diff --git a/demos/pageflip/pageflip.qrc b/demos/qt3d/pageflip/pageflip.qrc
index 1584add51..1584add51 100644
--- a/demos/pageflip/pageflip.qrc
+++ b/demos/qt3d/pageflip/pageflip.qrc
diff --git a/demos/pageflip/pageflipmath.cpp b/demos/qt3d/pageflip/pageflipmath.cpp
index edf747bff..edf747bff 100644
--- a/demos/pageflip/pageflipmath.cpp
+++ b/demos/qt3d/pageflip/pageflipmath.cpp
diff --git a/demos/pageflip/pageflipmath_p.h b/demos/qt3d/pageflip/pageflipmath_p.h
index b926fac29..b926fac29 100644
--- a/demos/pageflip/pageflipmath_p.h
+++ b/demos/qt3d/pageflip/pageflipmath_p.h
diff --git a/demos/pageflip/qqpage1.png b/demos/qt3d/pageflip/qqpage1.png
index 8abf37d94..8abf37d94 100644
--- a/demos/pageflip/qqpage1.png
+++ b/demos/qt3d/pageflip/qqpage1.png
diff --git a/demos/pageflip/qqpage2.png b/demos/qt3d/pageflip/qqpage2.png
index afd1b0474..afd1b0474 100644
--- a/demos/pageflip/qqpage2.png
+++ b/demos/qt3d/pageflip/qqpage2.png
diff --git a/demos/pageflip/qqpage3.png b/demos/qt3d/pageflip/qqpage3.png
index fa2a85a02..fa2a85a02 100644
--- a/demos/pageflip/qqpage3.png
+++ b/demos/qt3d/pageflip/qqpage3.png
diff --git a/demos/pageflip/qqpage4.png b/demos/qt3d/pageflip/qqpage4.png
index 0a6ba7b03..0a6ba7b03 100644
--- a/demos/pageflip/qqpage4.png
+++ b/demos/qt3d/pageflip/qqpage4.png
diff --git a/demos/photobrowser3d/buttons.cpp b/demos/qt3d/photobrowser3d/buttons.cpp
index 497a4b5b2..497a4b5b2 100644
--- a/demos/photobrowser3d/buttons.cpp
+++ b/demos/qt3d/photobrowser3d/buttons.cpp
diff --git a/demos/photobrowser3d/buttons.h b/demos/qt3d/photobrowser3d/buttons.h
index 1e4475faf..1e4475faf 100644
--- a/demos/photobrowser3d/buttons.h
+++ b/demos/qt3d/photobrowser3d/buttons.h
diff --git a/demos/photobrowser3d/bytereader.cpp b/demos/qt3d/photobrowser3d/bytereader.cpp
index 71c3b3f12..71c3b3f12 100644
--- a/demos/photobrowser3d/bytereader.cpp
+++ b/demos/qt3d/photobrowser3d/bytereader.cpp
diff --git a/demos/photobrowser3d/bytereader.h b/demos/qt3d/photobrowser3d/bytereader.h
index 2aa7dadf2..2aa7dadf2 100644
--- a/demos/photobrowser3d/bytereader.h
+++ b/demos/qt3d/photobrowser3d/bytereader.h
diff --git a/demos/photobrowser3d/filescanner.cpp b/demos/qt3d/photobrowser3d/filescanner.cpp
index 4010ebdab..4010ebdab 100644
--- a/demos/photobrowser3d/filescanner.cpp
+++ b/demos/qt3d/photobrowser3d/filescanner.cpp
diff --git a/demos/photobrowser3d/filescanner.h b/demos/qt3d/photobrowser3d/filescanner.h
index d9f15e9a9..d9f15e9a9 100644
--- a/demos/photobrowser3d/filescanner.h
+++ b/demos/qt3d/photobrowser3d/filescanner.h
diff --git a/demos/photobrowser3d/imagedisplay.cpp b/demos/qt3d/photobrowser3d/imagedisplay.cpp
index 73782aeb1..73782aeb1 100644
--- a/demos/photobrowser3d/imagedisplay.cpp
+++ b/demos/qt3d/photobrowser3d/imagedisplay.cpp
diff --git a/demos/photobrowser3d/imagedisplay.h b/demos/qt3d/photobrowser3d/imagedisplay.h
index 8bd051168..8bd051168 100644
--- a/demos/photobrowser3d/imagedisplay.h
+++ b/demos/qt3d/photobrowser3d/imagedisplay.h
diff --git a/demos/photobrowser3d/imageloader.cpp b/demos/qt3d/photobrowser3d/imageloader.cpp
index 912ae7209..912ae7209 100644
--- a/demos/photobrowser3d/imageloader.cpp
+++ b/demos/qt3d/photobrowser3d/imageloader.cpp
diff --git a/demos/photobrowser3d/imageloader.h b/demos/qt3d/photobrowser3d/imageloader.h
index 560436ede..560436ede 100644
--- a/demos/photobrowser3d/imageloader.h
+++ b/demos/qt3d/photobrowser3d/imageloader.h
diff --git a/demos/photobrowser3d/imagemanager.cpp b/demos/qt3d/photobrowser3d/imagemanager.cpp
index 30e2148d4..30e2148d4 100644
--- a/demos/photobrowser3d/imagemanager.cpp
+++ b/demos/qt3d/photobrowser3d/imagemanager.cpp
diff --git a/demos/photobrowser3d/imagemanager.h b/demos/qt3d/photobrowser3d/imagemanager.h
index 51482b1cd..51482b1cd 100644
--- a/demos/photobrowser3d/imagemanager.h
+++ b/demos/qt3d/photobrowser3d/imagemanager.h
diff --git a/demos/photobrowser3d/images/P1000223.JPG b/demos/qt3d/photobrowser3d/images/P1000223.JPG
index 48edfbc2d..48edfbc2d 100644
--- a/demos/photobrowser3d/images/P1000223.JPG
+++ b/demos/qt3d/photobrowser3d/images/P1000223.JPG
diff --git a/demos/photobrowser3d/images/P1000228.JPG b/demos/qt3d/photobrowser3d/images/P1000228.JPG
index 2797b6df5..2797b6df5 100644
--- a/demos/photobrowser3d/images/P1000228.JPG
+++ b/demos/qt3d/photobrowser3d/images/P1000228.JPG
diff --git a/demos/photobrowser3d/images/P1000441.JPG b/demos/qt3d/photobrowser3d/images/P1000441.JPG
index b4037b49e..b4037b49e 100644
--- a/demos/photobrowser3d/images/P1000441.JPG
+++ b/demos/qt3d/photobrowser3d/images/P1000441.JPG
diff --git a/demos/photobrowser3d/images/P1000472.JPG b/demos/qt3d/photobrowser3d/images/P1000472.JPG
index 067afdd4a..067afdd4a 100644
--- a/demos/photobrowser3d/images/P1000472.JPG
+++ b/demos/qt3d/photobrowser3d/images/P1000472.JPG
diff --git a/demos/photobrowser3d/images/arrows-left.png b/demos/qt3d/photobrowser3d/images/arrows-left.png
index 791f2c6b1..791f2c6b1 100644
--- a/demos/photobrowser3d/images/arrows-left.png
+++ b/demos/qt3d/photobrowser3d/images/arrows-left.png
diff --git a/demos/photobrowser3d/images/arrows.xcf b/demos/qt3d/photobrowser3d/images/arrows.xcf
index 302bcd6eb..302bcd6eb 100644
--- a/demos/photobrowser3d/images/arrows.xcf
+++ b/demos/qt3d/photobrowser3d/images/arrows.xcf
diff --git a/demos/photobrowser3d/images/default_sky_base.xcf b/demos/qt3d/photobrowser3d/images/default_sky_base.xcf
index 050812f7d..050812f7d 100644
--- a/demos/photobrowser3d/images/default_sky_base.xcf
+++ b/demos/qt3d/photobrowser3d/images/default_sky_base.xcf
diff --git a/demos/photobrowser3d/images/default_sky_down.png b/demos/qt3d/photobrowser3d/images/default_sky_down.png
index 531ba75e9..531ba75e9 100644
--- a/demos/photobrowser3d/images/default_sky_down.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_down.png
diff --git a/demos/photobrowser3d/images/default_sky_east.png b/demos/qt3d/photobrowser3d/images/default_sky_east.png
index 09bfc3ad5..09bfc3ad5 100644
--- a/demos/photobrowser3d/images/default_sky_east.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_east.png
diff --git a/demos/photobrowser3d/images/default_sky_north.png b/demos/qt3d/photobrowser3d/images/default_sky_north.png
index b97aaa20a..b97aaa20a 100644
--- a/demos/photobrowser3d/images/default_sky_north.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_north.png
diff --git a/demos/photobrowser3d/images/default_sky_south.png b/demos/qt3d/photobrowser3d/images/default_sky_south.png
index 28db27816..28db27816 100644
--- a/demos/photobrowser3d/images/default_sky_south.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_south.png
diff --git a/demos/photobrowser3d/images/default_sky_up.png b/demos/qt3d/photobrowser3d/images/default_sky_up.png
index a56feddbf..a56feddbf 100644
--- a/demos/photobrowser3d/images/default_sky_up.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_up.png
diff --git a/demos/photobrowser3d/images/default_sky_west.png b/demos/qt3d/photobrowser3d/images/default_sky_west.png
index 4d2746b0d..4d2746b0d 100644
--- a/demos/photobrowser3d/images/default_sky_west.png
+++ b/demos/qt3d/photobrowser3d/images/default_sky_west.png
diff --git a/demos/photobrowser3d/images/girder.png b/demos/qt3d/photobrowser3d/images/girder.png
index f9b6c4dc6..f9b6c4dc6 100644
--- a/demos/photobrowser3d/images/girder.png
+++ b/demos/qt3d/photobrowser3d/images/girder.png
diff --git a/demos/photobrowser3d/images/no-images-yet.png b/demos/qt3d/photobrowser3d/images/no-images-yet.png
index 5d4f673ae..5d4f673ae 100644
--- a/demos/photobrowser3d/images/no-images-yet.png
+++ b/demos/qt3d/photobrowser3d/images/no-images-yet.png
diff --git a/demos/photobrowser3d/images/no-images-yet.xcf b/demos/qt3d/photobrowser3d/images/no-images-yet.xcf
index f084d45e4..f084d45e4 100644
--- a/demos/photobrowser3d/images/no-images-yet.xcf
+++ b/demos/qt3d/photobrowser3d/images/no-images-yet.xcf
diff --git a/demos/photobrowser3d/images/sample_image.jpg b/demos/qt3d/photobrowser3d/images/sample_image.jpg
index 2826f9251..2826f9251 100644
--- a/demos/photobrowser3d/images/sample_image.jpg
+++ b/demos/qt3d/photobrowser3d/images/sample_image.jpg
diff --git a/demos/photobrowser3d/launcher.cpp b/demos/qt3d/photobrowser3d/launcher.cpp
index 3005bb19c..3005bb19c 100644
--- a/demos/photobrowser3d/launcher.cpp
+++ b/demos/qt3d/photobrowser3d/launcher.cpp
diff --git a/demos/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp
index 748866bab..748866bab 100644
--- a/demos/photobrowser3d/main.cpp
+++ b/demos/qt3d/photobrowser3d/main.cpp
diff --git a/demos/photobrowser3d/pancontroller.cpp b/demos/qt3d/photobrowser3d/pancontroller.cpp
index e45b4abeb..e45b4abeb 100644
--- a/demos/photobrowser3d/pancontroller.cpp
+++ b/demos/qt3d/photobrowser3d/pancontroller.cpp
diff --git a/demos/photobrowser3d/pancontroller.h b/demos/qt3d/photobrowser3d/pancontroller.h
index c0354b618..c0354b618 100644
--- a/demos/photobrowser3d/pancontroller.h
+++ b/demos/qt3d/photobrowser3d/pancontroller.h
diff --git a/demos/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index b5c695bca..b5c695bca 100644
--- a/demos/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
diff --git a/demos/photobrowser3d/photobrowser3d.qrc b/demos/qt3d/photobrowser3d/photobrowser3d.qrc
index 351c9faf3..351c9faf3 100644
--- a/demos/photobrowser3d/photobrowser3d.qrc
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.qrc
diff --git a/demos/photobrowser3d/photobrowser3dview.cpp b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
index f73f9a19c..f73f9a19c 100644
--- a/demos/photobrowser3d/photobrowser3dview.cpp
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
diff --git a/demos/photobrowser3d/photobrowser3dview.h b/demos/qt3d/photobrowser3d/photobrowser3dview.h
index 97d484e71..97d484e71 100644
--- a/demos/photobrowser3d/photobrowser3dview.h
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.h
diff --git a/demos/photobrowser3d/qatlas.cpp b/demos/qt3d/photobrowser3d/qatlas.cpp
index 7973a0c0c..7973a0c0c 100644
--- a/demos/photobrowser3d/qatlas.cpp
+++ b/demos/qt3d/photobrowser3d/qatlas.cpp
diff --git a/demos/photobrowser3d/qatlas.h b/demos/qt3d/photobrowser3d/qatlas.h
index 555b7e55c..555b7e55c 100644
--- a/demos/photobrowser3d/qatlas.h
+++ b/demos/qt3d/photobrowser3d/qatlas.h
diff --git a/demos/photobrowser3d/qfocusadaptor.cpp b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
index cf96f3a01..cf96f3a01 100644
--- a/demos/photobrowser3d/qfocusadaptor.cpp
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
diff --git a/demos/photobrowser3d/qfocusadaptor.h b/demos/qt3d/photobrowser3d/qfocusadaptor.h
index a8307e74b..a8307e74b 100644
--- a/demos/photobrowser3d/qfocusadaptor.h
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.h
diff --git a/demos/photobrowser3d/qphotobrowser3dscene.cpp b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp
index d1d70d6f4..d1d70d6f4 100644
--- a/demos/photobrowser3d/qphotobrowser3dscene.cpp
+++ b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp
diff --git a/demos/photobrowser3d/qphotobrowser3dscene.h b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
index bc70265f3..bc70265f3 100644
--- a/demos/photobrowser3d/qphotobrowser3dscene.h
+++ b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
diff --git a/demos/photobrowser3d/shaders/replace_texture.fsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
index 2c296dc78..2c296dc78 100644
--- a/demos/photobrowser3d/shaders/replace_texture.fsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
diff --git a/demos/photobrowser3d/shaders/replace_texture.vsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
index 57d43af28..57d43af28 100644
--- a/demos/photobrowser3d/shaders/replace_texture.vsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
diff --git a/demos/photobrowser3d/skybox.cpp b/demos/qt3d/photobrowser3d/skybox.cpp
index f4d11fbfa..f4d11fbfa 100644
--- a/demos/photobrowser3d/skybox.cpp
+++ b/demos/qt3d/photobrowser3d/skybox.cpp
diff --git a/demos/photobrowser3d/skybox.h b/demos/qt3d/photobrowser3d/skybox.h
index 26ce9c26a..26ce9c26a 100644
--- a/demos/photobrowser3d/skybox.h
+++ b/demos/qt3d/photobrowser3d/skybox.h
diff --git a/demos/photobrowser3d/threadpool.cpp b/demos/qt3d/photobrowser3d/threadpool.cpp
index a14a82690..a14a82690 100644
--- a/demos/photobrowser3d/threadpool.cpp
+++ b/demos/qt3d/photobrowser3d/threadpool.cpp
diff --git a/demos/photobrowser3d/threadpool.h b/demos/qt3d/photobrowser3d/threadpool.h
index 6d52d2503..6d52d2503 100644
--- a/demos/photobrowser3d/threadpool.h
+++ b/demos/qt3d/photobrowser3d/threadpool.h
diff --git a/demos/photobrowser3d/thumbnailableimage.cpp b/demos/qt3d/photobrowser3d/thumbnailableimage.cpp
index 95e842e0f..95e842e0f 100644
--- a/demos/photobrowser3d/thumbnailableimage.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnailableimage.cpp
diff --git a/demos/photobrowser3d/thumbnailableimage.h b/demos/qt3d/photobrowser3d/thumbnailableimage.h
index 06d940e92..06d940e92 100644
--- a/demos/photobrowser3d/thumbnailableimage.h
+++ b/demos/qt3d/photobrowser3d/thumbnailableimage.h
diff --git a/demos/photobrowser3d/thumbnaileffect.cpp b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
index 9a98b7427..9a98b7427 100644
--- a/demos/photobrowser3d/thumbnaileffect.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
diff --git a/demos/photobrowser3d/thumbnaileffect.h b/demos/qt3d/photobrowser3d/thumbnaileffect.h
index 330e7d04d..330e7d04d 100644
--- a/demos/photobrowser3d/thumbnaileffect.h
+++ b/demos/qt3d/photobrowser3d/thumbnaileffect.h
diff --git a/demos/photobrowser3d/thumbnailnode.cpp b/demos/qt3d/photobrowser3d/thumbnailnode.cpp
index 78ad38d44..78ad38d44 100644
--- a/demos/photobrowser3d/thumbnailnode.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnailnode.cpp
diff --git a/demos/photobrowser3d/thumbnailnode.h b/demos/qt3d/photobrowser3d/thumbnailnode.h
index 467c05517..467c05517 100644
--- a/demos/photobrowser3d/thumbnailnode.h
+++ b/demos/qt3d/photobrowser3d/thumbnailnode.h
diff --git a/demos/qt3d/qt3d.pro b/demos/qt3d/qt3d.pro
new file mode 100644
index 000000000..d506a9909
--- /dev/null
+++ b/demos/qt3d/qt3d.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = teaservice shapes pageflip photobrowser3d cubehouse
diff --git a/demos/shapes/shapes.cpp b/demos/qt3d/shapes/shapes.cpp
index 2ff4b04f4..2ff4b04f4 100644
--- a/demos/shapes/shapes.cpp
+++ b/demos/qt3d/shapes/shapes.cpp
diff --git a/demos/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index 499c134c0..499c134c0 100644
--- a/demos/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
diff --git a/demos/teaservice/README b/demos/qt3d/teaservice/README
index d7d71a617..d7d71a617 100644
--- a/demos/teaservice/README
+++ b/demos/qt3d/teaservice/README
diff --git a/demos/teaservice/meshobject.cpp b/demos/qt3d/teaservice/meshobject.cpp
index 1ff49d30b..1ff49d30b 100644
--- a/demos/teaservice/meshobject.cpp
+++ b/demos/qt3d/teaservice/meshobject.cpp
diff --git a/demos/teaservice/meshobject.h b/demos/qt3d/teaservice/meshobject.h
index c0abb8813..c0abb8813 100644
--- a/demos/teaservice/meshobject.h
+++ b/demos/qt3d/teaservice/meshobject.h
diff --git a/demos/teaservice/per_pixel_lighting.fsh b/demos/qt3d/teaservice/per_pixel_lighting.fsh
index 166c4d44b..166c4d44b 100644
--- a/demos/teaservice/per_pixel_lighting.fsh
+++ b/demos/qt3d/teaservice/per_pixel_lighting.fsh
diff --git a/demos/teaservice/per_pixel_lighting.vsh b/demos/qt3d/teaservice/per_pixel_lighting.vsh
index c437652ef..c437652ef 100644
--- a/demos/teaservice/per_pixel_lighting.vsh
+++ b/demos/qt3d/teaservice/per_pixel_lighting.vsh
diff --git a/demos/teaservice/perpixeleffect.cpp b/demos/qt3d/teaservice/perpixeleffect.cpp
index 450f21396..450f21396 100644
--- a/demos/teaservice/perpixeleffect.cpp
+++ b/demos/qt3d/teaservice/perpixeleffect.cpp
diff --git a/demos/teaservice/perpixeleffect.h b/demos/qt3d/teaservice/perpixeleffect.h
index cf015abdf..cf015abdf 100644
--- a/demos/teaservice/perpixeleffect.h
+++ b/demos/qt3d/teaservice/perpixeleffect.h
diff --git a/demos/teaservice/sceneobject.cpp b/demos/qt3d/teaservice/sceneobject.cpp
index 438b6fa19..438b6fa19 100644
--- a/demos/teaservice/sceneobject.cpp
+++ b/demos/qt3d/teaservice/sceneobject.cpp
diff --git a/demos/teaservice/sceneobject.h b/demos/qt3d/teaservice/sceneobject.h
index edfaa82a6..edfaa82a6 100644
--- a/demos/teaservice/sceneobject.h
+++ b/demos/qt3d/teaservice/sceneobject.h
diff --git a/demos/teaservice/teacup.txt b/demos/qt3d/teaservice/teacup.txt
index f4dde3efd..f4dde3efd 100644
--- a/demos/teaservice/teacup.txt
+++ b/demos/qt3d/teaservice/teacup.txt
diff --git a/demos/teaservice/teaservice.cpp b/demos/qt3d/teaservice/teaservice.cpp
index 8923fb3ae..8923fb3ae 100644
--- a/demos/teaservice/teaservice.cpp
+++ b/demos/qt3d/teaservice/teaservice.cpp
diff --git a/demos/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index e08325de1..e08325de1 100644
--- a/demos/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
diff --git a/demos/teaservice/teaservice.qrc b/demos/qt3d/teaservice/teaservice.qrc
index ab55d88c0..ab55d88c0 100644
--- a/demos/teaservice/teaservice.qrc
+++ b/demos/qt3d/teaservice/teaservice.qrc
diff --git a/demos/teaservice/teaspoon.txt b/demos/qt3d/teaservice/teaspoon.txt
index 3c6a1b74b..3c6a1b74b 100644
--- a/demos/teaservice/teaspoon.txt
+++ b/demos/qt3d/teaservice/teaspoon.txt
diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp
new file mode 100644
index 000000000..cdad31ad5
--- /dev/null
+++ b/demos/quick3d/model_viewer/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/model_viewer.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/modelViewer/FourButtons.qml b/demos/quick3d/model_viewer/qml/FourButtons.qml
index dfc4a8409..dfc4a8409 100644
--- a/demos/declarative/modelViewer/FourButtons.qml
+++ b/demos/quick3d/model_viewer/qml/FourButtons.qml
diff --git a/demos/declarative/modelViewer/LongButton.qml b/demos/quick3d/model_viewer/qml/LongButton.qml
index f06c1bf31..f06c1bf31 100644
--- a/demos/declarative/modelViewer/LongButton.qml
+++ b/demos/quick3d/model_viewer/qml/LongButton.qml
diff --git a/demos/declarative/modelViewer/MainButton.qml b/demos/quick3d/model_viewer/qml/MainButton.qml
index 6f5cf0d0e..6f5cf0d0e 100644
--- a/demos/declarative/modelViewer/MainButton.qml
+++ b/demos/quick3d/model_viewer/qml/MainButton.qml
diff --git a/demos/declarative/modelViewer/ShortButton.qml b/demos/quick3d/model_viewer/qml/ShortButton.qml
index 665840bb1..665840bb1 100644
--- a/demos/declarative/modelViewer/ShortButton.qml
+++ b/demos/quick3d/model_viewer/qml/ShortButton.qml
diff --git a/demos/declarative/modelViewer/meshes/monkey.3ds b/demos/quick3d/model_viewer/qml/meshes/monkey.3ds
index e9a007b20..e9a007b20 100644
--- a/demos/declarative/modelViewer/meshes/monkey.3ds
+++ b/demos/quick3d/model_viewer/qml/meshes/monkey.3ds
diff --git a/demos/declarative/modelViewer/meshes/penguin.3ds b/demos/quick3d/model_viewer/qml/meshes/penguin.3ds
index 26c09ac07..26c09ac07 100644
--- a/demos/declarative/modelViewer/meshes/penguin.3ds
+++ b/demos/quick3d/model_viewer/qml/meshes/penguin.3ds
diff --git a/demos/declarative/modelViewer/modelviewer.qml b/demos/quick3d/model_viewer/qml/model_viewer.qml
index 251547a72..251547a72 100644
--- a/demos/declarative/modelViewer/modelviewer.qml
+++ b/demos/quick3d/model_viewer/qml/model_viewer.qml
diff --git a/demos/quick3d/quick3d.pro b/demos/quick3d/quick3d.pro
new file mode 100644
index 000000000..7c71fa551
--- /dev/null
+++ b/demos/quick3d/quick3d.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = model_viewer robo_bounce tea_service
diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp
new file mode 100644
index 000000000..fcecfe1e6
--- /dev/null
+++ b/demos/quick3d/robo_bounce/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/robobounce.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/RoboBounce/Assets/QML3DSign.png b/demos/quick3d/robo_bounce/qml/Assets/QML3DSign.png
index b4bfb88b2..b4bfb88b2 100644
--- a/demos/declarative/RoboBounce/Assets/QML3DSign.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/QML3DSign.png
diff --git a/demos/declarative/RoboBounce/Assets/button.png b/demos/quick3d/robo_bounce/qml/Assets/button.png
index 2943e2403..2943e2403 100644
--- a/demos/declarative/RoboBounce/Assets/button.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/button.png
diff --git a/demos/declarative/RoboBounce/Assets/calculatorSign.png b/demos/quick3d/robo_bounce/qml/Assets/calculatorSign.png
index 3a8fca728..3a8fca728 100644
--- a/demos/declarative/RoboBounce/Assets/calculatorSign.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/calculatorSign.png
diff --git a/demos/declarative/RoboBounce/Assets/cubeButton.png b/demos/quick3d/robo_bounce/qml/Assets/cubeButton.png
index 2ea32a8b2..2ea32a8b2 100644
--- a/demos/declarative/RoboBounce/Assets/cubeButton.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/cubeButton.png
diff --git a/demos/declarative/RoboBounce/Assets/hazard.png b/demos/quick3d/robo_bounce/qml/Assets/hazard.png
index a7c0b7fea..a7c0b7fea 100644
--- a/demos/declarative/RoboBounce/Assets/hazard.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/hazard.png
diff --git a/demos/declarative/RoboBounce/Assets/infobutton.png b/demos/quick3d/robo_bounce/qml/Assets/infobutton.png
index e7379f2d2..e7379f2d2 100644
--- a/demos/declarative/RoboBounce/Assets/infobutton.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/infobutton.png
diff --git a/demos/declarative/RoboBounce/Assets/qtlogo.png b/demos/quick3d/robo_bounce/qml/Assets/qtlogo.png
index 3bf1a77d0..3bf1a77d0 100644
--- a/demos/declarative/RoboBounce/Assets/qtlogo.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/qtlogo.png
diff --git a/demos/declarative/RoboBounce/Assets/roboInfo.png b/demos/quick3d/robo_bounce/qml/Assets/roboInfo.png
index b7bdda199..b7bdda199 100644
--- a/demos/declarative/RoboBounce/Assets/roboInfo.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/roboInfo.png
diff --git a/demos/declarative/RoboBounce/Assets/roboticArms.3ds b/demos/quick3d/robo_bounce/qml/Assets/roboticArms.3ds
index 478d27bfc..478d27bfc 100644
--- a/demos/declarative/RoboBounce/Assets/roboticArms.3ds
+++ b/demos/quick3d/robo_bounce/qml/Assets/roboticArms.3ds
diff --git a/demos/declarative/RoboBounce/Assets/roboticBody.3ds b/demos/quick3d/robo_bounce/qml/Assets/roboticBody.3ds
index ed872c82a..ed872c82a 100644
--- a/demos/declarative/RoboBounce/Assets/roboticBody.3ds
+++ b/demos/quick3d/robo_bounce/qml/Assets/roboticBody.3ds
diff --git a/demos/declarative/RoboBounce/Assets/roboticHead.3ds b/demos/quick3d/robo_bounce/qml/Assets/roboticHead.3ds
index 7a517c2b3..7a517c2b3 100644
--- a/demos/declarative/RoboBounce/Assets/roboticHead.3ds
+++ b/demos/quick3d/robo_bounce/qml/Assets/roboticHead.3ds
diff --git a/demos/declarative/RoboBounce/Assets/rotateButton2.png b/demos/quick3d/robo_bounce/qml/Assets/rotateButton2.png
index 80a2d82a3..80a2d82a3 100644
--- a/demos/declarative/RoboBounce/Assets/rotateButton2.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/rotateButton2.png
diff --git a/demos/declarative/RoboBounce/Assets/sQt3D_logo.png b/demos/quick3d/robo_bounce/qml/Assets/sQt3D_logo.png
index 92a071d36..92a071d36 100644
--- a/demos/declarative/RoboBounce/Assets/sQt3D_logo.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/sQt3D_logo.png
diff --git a/demos/declarative/RoboBounce/Assets/tronscape.png b/demos/quick3d/robo_bounce/qml/Assets/tronscape.png
index 325f60e38..325f60e38 100644
--- a/demos/declarative/RoboBounce/Assets/tronscape.png
+++ b/demos/quick3d/robo_bounce/qml/Assets/tronscape.png
diff --git a/demos/declarative/RoboBounce/Calculator/Calculator.qml b/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
index b4c704986..b4c704986 100644
--- a/demos/declarative/RoboBounce/Calculator/Calculator.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/Button.qml b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
index 02a0119a5..02a0119a5 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/Button.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/Display.qml b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
index 6e9e664b4..6e9e664b4 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/Display.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/calculator.js b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/calculator.js
index 7c363c7f3..7c363c7f3 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/calculator.js
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/calculator.js
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-.png
index 544e51453..544e51453 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-blue.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-blue.png
index 5f92de32d..5f92de32d 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-blue.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-blue.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-green.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-green.png
index 36c93914c..36c93914c 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-green.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-green.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-purple.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-purple.png
index 347cbbea9..347cbbea9 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-purple.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-purple.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-red.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-red.png
index 3b335891a..3b335891a 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/button-red.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/button-red.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/display.png b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/display.png
index 9507f4382..9507f4382 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/images/display.png
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/images/display.png
diff --git a/demos/declarative/RoboBounce/Calculator/CalculatorCore/qmldir b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/qmldir
index a926b93fa..a926b93fa 100644
--- a/demos/declarative/RoboBounce/Calculator/CalculatorCore/qmldir
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/qmldir
diff --git a/demos/declarative/RoboBounce/RobotCore/PushButton.qml b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
index 8cc48744f..8cc48744f 100644
--- a/demos/declarative/RoboBounce/RobotCore/PushButton.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
diff --git a/demos/declarative/RoboBounce/RobotCore/QMLPanels.qml b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
index 874436dd4..874436dd4 100644
--- a/demos/declarative/RoboBounce/RobotCore/QMLPanels.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
diff --git a/demos/declarative/RoboBounce/RobotCore/Robot.qml b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
index c696b794b..c696b794b 100644
--- a/demos/declarative/RoboBounce/RobotCore/Robot.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
diff --git a/demos/declarative/RoboBounce/RobotCore/TronCube.qml b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
index 9e352602c..9e352602c 100644
--- a/demos/declarative/RoboBounce/RobotCore/TronCube.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
diff --git a/demos/declarative/RoboBounce/robobounce.qml b/demos/quick3d/robo_bounce/qml/robobounce.qml
index a5b871114..a5b871114 100644
--- a/demos/declarative/RoboBounce/robobounce.qml
+++ b/demos/quick3d/robo_bounce/qml/robobounce.qml
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp
new file mode 100644
index 000000000..1cd7129f0
--- /dev/null
+++ b/demos/quick3d/tea_service/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/teaservice.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/teaservice/Teacup.qml b/demos/quick3d/tea_service/qml/Teacup.qml
index f4c868253..f4c868253 100644
--- a/demos/declarative/teaservice/Teacup.qml
+++ b/demos/quick3d/tea_service/qml/Teacup.qml
diff --git a/demos/declarative/teaservice/Teaspoon.qml b/demos/quick3d/tea_service/qml/Teaspoon.qml
index 72125f4be..72125f4be 100644
--- a/demos/declarative/teaservice/Teaspoon.qml
+++ b/demos/quick3d/tea_service/qml/Teaspoon.qml
diff --git a/demos/declarative/teaservice/teacup.bez b/demos/quick3d/tea_service/qml/teacup.bez
index f4dde3efd..f4dde3efd 100644
--- a/demos/declarative/teaservice/teacup.bez
+++ b/demos/quick3d/tea_service/qml/teacup.bez
diff --git a/demos/declarative/teaservice/teapot-body.bez b/demos/quick3d/tea_service/qml/teapot-body.bez
index 614daf09b..614daf09b 100644
--- a/demos/declarative/teaservice/teapot-body.bez
+++ b/demos/quick3d/tea_service/qml/teapot-body.bez
diff --git a/demos/declarative/teaservice/teapot-handle.bez b/demos/quick3d/tea_service/qml/teapot-handle.bez
index a2a3503ec..a2a3503ec 100644
--- a/demos/declarative/teaservice/teapot-handle.bez
+++ b/demos/quick3d/tea_service/qml/teapot-handle.bez
diff --git a/demos/declarative/teaservice/teapot-spout.bez b/demos/quick3d/tea_service/qml/teapot-spout.bez
index 7674812ea..7674812ea 100644
--- a/demos/declarative/teaservice/teapot-spout.bez
+++ b/demos/quick3d/tea_service/qml/teapot-spout.bez
diff --git a/demos/declarative/teaservice/teaservice.qml b/demos/quick3d/tea_service/qml/teaservice.qml
index f549fd50f..f549fd50f 100644
--- a/demos/declarative/teaservice/teaservice.qml
+++ b/demos/quick3d/tea_service/qml/teaservice.qml
diff --git a/demos/declarative/teaservice/teaservice.qmlproject b/demos/quick3d/tea_service/qml/teaservice.qmlproject
index d4909f868..d4909f868 100644
--- a/demos/declarative/teaservice/teaservice.qmlproject
+++ b/demos/quick3d/tea_service/qml/teaservice.qmlproject
diff --git a/demos/declarative/teaservice/teaspoon.bez b/demos/quick3d/tea_service/qml/teaspoon.bez
index c304fbde0..c304fbde0 100644
--- a/demos/declarative/teaservice/teaspoon.bez
+++ b/demos/quick3d/tea_service/qml/teaspoon.bez
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/examples.pro b/examples/examples.pro
index a25bb6e91..b008b37d8 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += basket builder cube cylinder geometry graphicsview nesting tank teapot tutorials
+SUBDIRS += quick3d qt3d
diff --git a/examples/qt3d/README b/examples/qt3d/README
new file mode 100644
index 000000000..2a45154d9
--- /dev/null
+++ b/examples/qt3d/README
@@ -0,0 +1,14 @@
+This directory contains examples for the Qt3D C++ API.
+
+Qt3D can be used to extend Qt Quick3D with custom 3D items.  Qt3D is also
+a general 3D toolkit, featuring a scenegraph API, support for OpenGL VBO's
+and other utilities for general 3D programming.
+
+Research work on Qt3D also continues in the labs repository:
+
+  http://qt.gitorious.org/qt-labs/qt3d
+
+...and is from time to time ported into Qt Quick3D.
+
+Check the labs version of Qt3D for additional cutting edge features such as
+support for stereoscopic hardware.
diff --git a/examples/basket/README b/examples/qt3d/basket/README
index 560fd74c5..560fd74c5 100644
--- a/examples/basket/README
+++ b/examples/qt3d/basket/README
diff --git a/demos/declarative/textures/basket.jpg b/examples/qt3d/basket/basket.jpg
index 438e7a0c2..438e7a0c2 100644
--- a/demos/declarative/textures/basket.jpg
+++ b/examples/qt3d/basket/basket.jpg
diff --git a/examples/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 8c24581b0..8c24581b0 100644
--- a/examples/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
diff --git a/examples/basket/basket.qrc b/examples/qt3d/basket/basket.qrc
index 590b65c7a..590b65c7a 100644
--- a/examples/basket/basket.qrc
+++ b/examples/qt3d/basket/basket.qrc
diff --git a/examples/basket/basket_data.h b/examples/qt3d/basket/basket_data.h
index d456a6924..d456a6924 100644
--- a/examples/basket/basket_data.h
+++ b/examples/qt3d/basket/basket_data.h
diff --git a/examples/basket/basket_data.txt b/examples/qt3d/basket/basket_data.txt
index 6b693b5a7..6b693b5a7 100644
--- a/examples/basket/basket_data.txt
+++ b/examples/qt3d/basket/basket_data.txt
diff --git a/examples/basket/basketview.cpp b/examples/qt3d/basket/basketview.cpp
index 41b20dfbb..41b20dfbb 100644
--- a/examples/basket/basketview.cpp
+++ b/examples/qt3d/basket/basketview.cpp
diff --git a/examples/basket/basketview.h b/examples/qt3d/basket/basketview.h
index 03a8d61fd..03a8d61fd 100644
--- a/examples/basket/basketview.h
+++ b/examples/qt3d/basket/basketview.h
diff --git a/examples/basket/main.cpp b/examples/qt3d/basket/main.cpp
index c8d28193d..c8d28193d 100644
--- a/examples/basket/main.cpp
+++ b/examples/qt3d/basket/main.cpp
diff --git a/examples/builder/builder.cpp b/examples/qt3d/builder/builder.cpp
index 3628b4d43..3628b4d43 100644
--- a/examples/builder/builder.cpp
+++ b/examples/qt3d/builder/builder.cpp
diff --git a/examples/builder/builder.h b/examples/qt3d/builder/builder.h
index a54dea6bf..a54dea6bf 100644
--- a/examples/builder/builder.h
+++ b/examples/qt3d/builder/builder.h
diff --git a/examples/builder/builder.pro b/examples/qt3d/builder/builder.pro
index 2fac6f330..2fac6f330 100644
--- a/examples/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
diff --git a/examples/builder/builder.qrc b/examples/qt3d/builder/builder.qrc
index 8eefbaf1d..8eefbaf1d 100644
--- a/examples/builder/builder.qrc
+++ b/examples/qt3d/builder/builder.qrc
diff --git a/examples/builder/main.cpp b/examples/qt3d/builder/main.cpp
index ade7d1008..ade7d1008 100644
--- a/examples/builder/main.cpp
+++ b/examples/qt3d/builder/main.cpp
diff --git a/examples/builder/qt-soup.png b/examples/qt3d/builder/qt-soup.png
index 5b264fffa..5b264fffa 100644
--- a/examples/builder/qt-soup.png
+++ b/examples/qt3d/builder/qt-soup.png
diff --git a/examples/cube/cube.pro b/examples/qt3d/cube/cube.pro
index ec2bc6967..ec2bc6967 100644
--- a/examples/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
diff --git a/examples/cube/cube.qrc b/examples/qt3d/cube/cube.qrc
index 70f5024d9..70f5024d9 100644
--- a/examples/cube/cube.qrc
+++ b/examples/qt3d/cube/cube.qrc
diff --git a/examples/cube/cubeview.cpp b/examples/qt3d/cube/cubeview.cpp
index e8de75168..e8de75168 100644
--- a/examples/cube/cubeview.cpp
+++ b/examples/qt3d/cube/cubeview.cpp
diff --git a/examples/cube/cubeview.h b/examples/qt3d/cube/cubeview.h
index 8996fd342..8996fd342 100644
--- a/examples/cube/cubeview.h
+++ b/examples/qt3d/cube/cubeview.h
diff --git a/examples/cube/main.cpp b/examples/qt3d/cube/main.cpp
index 1def235d5..1def235d5 100644
--- a/examples/cube/main.cpp
+++ b/examples/qt3d/cube/main.cpp
diff --git a/demos/declarative/textures/qtlogo.png b/examples/qt3d/cube/qtlogo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/demos/declarative/textures/qtlogo.png
+++ b/examples/qt3d/cube/qtlogo.png
diff --git a/examples/cylinder/cubeview.cpp b/examples/qt3d/cylinder/cubeview.cpp
index 4569caeb0..4569caeb0 100644
--- a/examples/cylinder/cubeview.cpp
+++ b/examples/qt3d/cylinder/cubeview.cpp
diff --git a/examples/cylinder/cubeview.h b/examples/qt3d/cylinder/cubeview.h
index 8996fd342..8996fd342 100644
--- a/examples/cylinder/cubeview.h
+++ b/examples/qt3d/cylinder/cubeview.h
diff --git a/examples/cylinder/cupTexture.png b/examples/qt3d/cylinder/cupTexture.png
index e099dea22..e099dea22 100644
--- a/examples/cylinder/cupTexture.png
+++ b/examples/qt3d/cylinder/cupTexture.png
diff --git a/examples/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index ee018cb9d..ee018cb9d 100644
--- a/examples/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
diff --git a/examples/cylinder/cylinder.qrc b/examples/qt3d/cylinder/cylinder.qrc
index 20fa400f7..20fa400f7 100644
--- a/examples/cylinder/cylinder.qrc
+++ b/examples/qt3d/cylinder/cylinder.qrc
diff --git a/examples/cylinder/cylinderview.cpp b/examples/qt3d/cylinder/cylinderview.cpp
index 2b347ab68..2b347ab68 100644
--- a/examples/cylinder/cylinderview.cpp
+++ b/examples/qt3d/cylinder/cylinderview.cpp
diff --git a/examples/cylinder/cylinderview.h b/examples/qt3d/cylinder/cylinderview.h
index c2f4824b9..c2f4824b9 100644
--- a/examples/cylinder/cylinderview.h
+++ b/examples/qt3d/cylinder/cylinderview.h
diff --git a/examples/cylinder/latte.png b/examples/qt3d/cylinder/latte.png
index 6902b96c6..6902b96c6 100644
--- a/examples/cylinder/latte.png
+++ b/examples/qt3d/cylinder/latte.png
diff --git a/examples/cylinder/main.cpp b/examples/qt3d/cylinder/main.cpp
index 5ea06b74e..5ea06b74e 100644
--- a/examples/cylinder/main.cpp
+++ b/examples/qt3d/cylinder/main.cpp
diff --git a/examples/geometry/EarthFlat_512x512.jpg b/examples/qt3d/geometry/EarthFlat_512x512.jpg
index 28864977b..28864977b 100644
--- a/examples/geometry/EarthFlat_512x512.jpg
+++ b/examples/qt3d/geometry/EarthFlat_512x512.jpg
diff --git a/examples/geometry/bullseye.png b/examples/qt3d/geometry/bullseye.png
index e67cf7038..e67cf7038 100644
--- a/examples/geometry/bullseye.png
+++ b/examples/qt3d/geometry/bullseye.png
diff --git a/examples/geometry/geometry.cpp b/examples/qt3d/geometry/geometry.cpp
index c8f262c14..c8f262c14 100644
--- a/examples/geometry/geometry.cpp
+++ b/examples/qt3d/geometry/geometry.cpp
diff --git a/examples/geometry/geometry.h b/examples/qt3d/geometry/geometry.h
index f9a356fc8..f9a356fc8 100644
--- a/examples/geometry/geometry.h
+++ b/examples/qt3d/geometry/geometry.h
diff --git a/examples/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 66025be88..66025be88 100644
--- a/examples/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
diff --git a/examples/geometry/geometry.qrc b/examples/qt3d/geometry/geometry.qrc
index 4599a46ad..4599a46ad 100644
--- a/examples/geometry/geometry.qrc
+++ b/examples/qt3d/geometry/geometry.qrc
diff --git a/examples/geometry/geometryview.cpp b/examples/qt3d/geometry/geometryview.cpp
index 762e56fcd..762e56fcd 100644
--- a/examples/geometry/geometryview.cpp
+++ b/examples/qt3d/geometry/geometryview.cpp
diff --git a/examples/geometry/geometryview.h b/examples/qt3d/geometry/geometryview.h
index 822a7a409..822a7a409 100644
--- a/examples/geometry/geometryview.h
+++ b/examples/qt3d/geometry/geometryview.h
diff --git a/examples/geometry/main.cpp b/examples/qt3d/geometry/main.cpp
index 9ec88be7b..9ec88be7b 100644
--- a/examples/geometry/main.cpp
+++ b/examples/qt3d/geometry/main.cpp
diff --git a/examples/geometry/quadplane.cpp b/examples/qt3d/geometry/quadplane.cpp
index 3387002bc..3387002bc 100644
--- a/examples/geometry/quadplane.cpp
+++ b/examples/qt3d/geometry/quadplane.cpp
diff --git a/examples/geometry/quadplane.h b/examples/qt3d/geometry/quadplane.h
index e95d1907f..e95d1907f 100644
--- a/examples/geometry/quadplane.h
+++ b/examples/qt3d/geometry/quadplane.h
diff --git a/examples/graphicsview/cubeicon.png b/examples/qt3d/graphicsview/cubeicon.png
index 9979fb582..9979fb582 100644
--- a/examples/graphicsview/cubeicon.png
+++ b/examples/qt3d/graphicsview/cubeicon.png
diff --git a/examples/graphicsview/cubeitem.cpp b/examples/qt3d/graphicsview/cubeitem.cpp
index 10c7609f8..10c7609f8 100644
--- a/examples/graphicsview/cubeitem.cpp
+++ b/examples/qt3d/graphicsview/cubeitem.cpp
diff --git a/examples/graphicsview/cubeitem.h b/examples/qt3d/graphicsview/cubeitem.h
index 67b4aa257..67b4aa257 100644
--- a/examples/graphicsview/cubeitem.h
+++ b/examples/qt3d/graphicsview/cubeitem.h
diff --git a/examples/graphicsview/edge.cpp b/examples/qt3d/graphicsview/edge.cpp
index bf480ec4b..bf480ec4b 100644
--- a/examples/graphicsview/edge.cpp
+++ b/examples/qt3d/graphicsview/edge.cpp
diff --git a/examples/graphicsview/edge.h b/examples/qt3d/graphicsview/edge.h
index d50c403a9..d50c403a9 100644
--- a/examples/graphicsview/edge.h
+++ b/examples/qt3d/graphicsview/edge.h
diff --git a/examples/graphicsview/graph.cpp b/examples/qt3d/graphicsview/graph.cpp
index 2aa28b107..2aa28b107 100644
--- a/examples/graphicsview/graph.cpp
+++ b/examples/qt3d/graphicsview/graph.cpp
diff --git a/examples/graphicsview/graph.h b/examples/qt3d/graphicsview/graph.h
index 0fa897ce8..0fa897ce8 100644
--- a/examples/graphicsview/graph.h
+++ b/examples/qt3d/graphicsview/graph.h
diff --git a/examples/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index 98aba411d..98aba411d 100644
--- a/examples/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
diff --git a/examples/graphicsview/graphicsview.qrc b/examples/qt3d/graphicsview/graphicsview.qrc
index 37a99a114..37a99a114 100644
--- a/examples/graphicsview/graphicsview.qrc
+++ b/examples/qt3d/graphicsview/graphicsview.qrc
diff --git a/examples/graphicsview/main.cpp b/examples/qt3d/graphicsview/main.cpp
index 39a3d7a08..39a3d7a08 100644
--- a/examples/graphicsview/main.cpp
+++ b/examples/qt3d/graphicsview/main.cpp
diff --git a/examples/graphicsview/modelitem.cpp b/examples/qt3d/graphicsview/modelitem.cpp
index 41ba13833..41ba13833 100644
--- a/examples/graphicsview/modelitem.cpp
+++ b/examples/qt3d/graphicsview/modelitem.cpp
diff --git a/examples/graphicsview/modelitem.h b/examples/qt3d/graphicsview/modelitem.h
index 063cbb2b2..063cbb2b2 100644
--- a/examples/graphicsview/modelitem.h
+++ b/examples/qt3d/graphicsview/modelitem.h
diff --git a/examples/graphicsview/node.cpp b/examples/qt3d/graphicsview/node.cpp
index 4723b0ab4..4723b0ab4 100644
--- a/examples/graphicsview/node.cpp
+++ b/examples/qt3d/graphicsview/node.cpp
diff --git a/examples/graphicsview/node.h b/examples/qt3d/graphicsview/node.h
index 45208610a..45208610a 100644
--- a/examples/graphicsview/node.h
+++ b/examples/qt3d/graphicsview/node.h
diff --git a/examples/graphicsview/scene.cpp b/examples/qt3d/graphicsview/scene.cpp
index 5fe551058..5fe551058 100644
--- a/examples/graphicsview/scene.cpp
+++ b/examples/qt3d/graphicsview/scene.cpp
diff --git a/examples/graphicsview/scene.h b/examples/qt3d/graphicsview/scene.h
index 73be795a8..73be795a8 100644
--- a/examples/graphicsview/scene.h
+++ b/examples/qt3d/graphicsview/scene.h
diff --git a/examples/graphicsview/teapoticon.png b/examples/qt3d/graphicsview/teapoticon.png
index 17392361d..17392361d 100644
--- a/examples/graphicsview/teapoticon.png
+++ b/examples/qt3d/graphicsview/teapoticon.png
diff --git a/examples/graphicsview/teapotitem.cpp b/examples/qt3d/graphicsview/teapotitem.cpp
index 72161a5a2..72161a5a2 100644
--- a/examples/graphicsview/teapotitem.cpp
+++ b/examples/qt3d/graphicsview/teapotitem.cpp
diff --git a/examples/graphicsview/teapotitem.h b/examples/qt3d/graphicsview/teapotitem.h
index f2706eeb1..f2706eeb1 100644
--- a/examples/graphicsview/teapotitem.h
+++ b/examples/qt3d/graphicsview/teapotitem.h
diff --git a/examples/graphicsview/view.cpp b/examples/qt3d/graphicsview/view.cpp
index 73f4bb6c9..73f4bb6c9 100644
--- a/examples/graphicsview/view.cpp
+++ b/examples/qt3d/graphicsview/view.cpp
diff --git a/examples/graphicsview/view.h b/examples/qt3d/graphicsview/view.h
index f47a7249b..f47a7249b 100644
--- a/examples/graphicsview/view.h
+++ b/examples/qt3d/graphicsview/view.h
diff --git a/examples/nesting/cubeview.cpp b/examples/qt3d/nesting/cubeview.cpp
index d14b5048e..d14b5048e 100644
--- a/examples/nesting/cubeview.cpp
+++ b/examples/qt3d/nesting/cubeview.cpp
diff --git a/examples/nesting/cubeview.h b/examples/qt3d/nesting/cubeview.h
index 1fae5de4d..1fae5de4d 100644
--- a/examples/nesting/cubeview.h
+++ b/examples/qt3d/nesting/cubeview.h
diff --git a/examples/nesting/main.cpp b/examples/qt3d/nesting/main.cpp
index f3d5764d0..f3d5764d0 100644
--- a/examples/nesting/main.cpp
+++ b/examples/qt3d/nesting/main.cpp
diff --git a/examples/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index 0ea63d333..0ea63d333 100644
--- a/examples/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
diff --git a/examples/nesting/nesting.qrc b/examples/qt3d/nesting/nesting.qrc
index 70f5024d9..70f5024d9 100644
--- a/examples/nesting/nesting.qrc
+++ b/examples/qt3d/nesting/nesting.qrc
diff --git a/examples/cube/qtlogo.png b/examples/qt3d/nesting/qtlogo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/examples/cube/qtlogo.png
+++ b/examples/qt3d/nesting/qtlogo.png
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
new file mode 100644
index 000000000..a25bb6e91
--- /dev/null
+++ b/examples/qt3d/qt3d.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += basket builder cube cylinder geometry graphicsview nesting tank teapot tutorials
diff --git a/examples/tank/main.cpp b/examples/qt3d/tank/main.cpp
index ee9c1429b..ee9c1429b 100644
--- a/examples/tank/main.cpp
+++ b/examples/qt3d/tank/main.cpp
diff --git a/examples/tank/quadplane.cpp b/examples/qt3d/tank/quadplane.cpp
index fb3cf16b7..fb3cf16b7 100644
--- a/examples/tank/quadplane.cpp
+++ b/examples/qt3d/tank/quadplane.cpp
diff --git a/examples/tank/quadplane.h b/examples/qt3d/tank/quadplane.h
index 2ffc1963a..2ffc1963a 100644
--- a/examples/tank/quadplane.h
+++ b/examples/qt3d/tank/quadplane.h
diff --git a/examples/tank/tank.cpp b/examples/qt3d/tank/tank.cpp
index fe4fa8e8b..fe4fa8e8b 100644
--- a/examples/tank/tank.cpp
+++ b/examples/qt3d/tank/tank.cpp
diff --git a/examples/tank/tank.h b/examples/qt3d/tank/tank.h
index 894496404..894496404 100644
--- a/examples/tank/tank.h
+++ b/examples/qt3d/tank/tank.h
diff --git a/examples/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 50b916ff6..50b916ff6 100644
--- a/examples/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
diff --git a/examples/tank/tankview.cpp b/examples/qt3d/tank/tankview.cpp
index 9d4d7afbc..9d4d7afbc 100644
--- a/examples/tank/tankview.cpp
+++ b/examples/qt3d/tank/tankview.cpp
diff --git a/examples/tank/tankview.h b/examples/qt3d/tank/tankview.h
index 38b966158..38b966158 100644
--- a/examples/tank/tankview.h
+++ b/examples/qt3d/tank/tankview.h
diff --git a/examples/teapot/main.cpp b/examples/qt3d/teapot/main.cpp
index e14a10306..e14a10306 100644
--- a/examples/teapot/main.cpp
+++ b/examples/qt3d/teapot/main.cpp
diff --git a/examples/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index 1024f6a72..1024f6a72 100644
--- a/examples/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
diff --git a/examples/teapot/teapotview.cpp b/examples/qt3d/teapot/teapotview.cpp
index 2ffe53a34..2ffe53a34 100644
--- a/examples/teapot/teapotview.cpp
+++ b/examples/qt3d/teapot/teapotview.cpp
diff --git a/examples/teapot/teapotview.h b/examples/qt3d/teapot/teapotview.h
index d251f990a..d251f990a 100644
--- a/examples/teapot/teapotview.h
+++ b/examples/qt3d/teapot/teapotview.h
diff --git a/examples/tutorials/converting-rawgl/converting-rawgl.pro b/examples/qt3d/tutorials/converting-rawgl/converting-rawgl.pro
index 8263b9a7d..8263b9a7d 100644
--- a/examples/tutorials/converting-rawgl/converting-rawgl.pro
+++ b/examples/qt3d/tutorials/converting-rawgl/converting-rawgl.pro
diff --git a/examples/tutorials/converting/converting-rawgl.cpp b/examples/qt3d/tutorials/converting/converting-rawgl.cpp
index e65abd3a9..e65abd3a9 100644
--- a/examples/tutorials/converting/converting-rawgl.cpp
+++ b/examples/qt3d/tutorials/converting/converting-rawgl.cpp
diff --git a/examples/tutorials/converting/converting.cpp b/examples/qt3d/tutorials/converting/converting.cpp
index 51c47ffa8..51c47ffa8 100644
--- a/examples/tutorials/converting/converting.cpp
+++ b/examples/qt3d/tutorials/converting/converting.cpp
diff --git a/examples/tutorials/converting/converting.pro b/examples/qt3d/tutorials/converting/converting.pro
index b4febdaa5..b4febdaa5 100644
--- a/examples/tutorials/converting/converting.pro
+++ b/examples/qt3d/tutorials/converting/converting.pro
diff --git a/examples/tutorials/cube1/cube1.pro b/examples/qt3d/tutorials/cube1/cube1.pro
index 51df0efe0..51df0efe0 100644
--- a/examples/tutorials/cube1/cube1.pro
+++ b/examples/qt3d/tutorials/cube1/cube1.pro
diff --git a/examples/tutorials/cube1/cubeview.cpp b/examples/qt3d/tutorials/cube1/cubeview.cpp
index 51e074f62..51e074f62 100644
--- a/examples/tutorials/cube1/cubeview.cpp
+++ b/examples/qt3d/tutorials/cube1/cubeview.cpp
diff --git a/examples/tutorials/cube1/cubeview.h b/examples/qt3d/tutorials/cube1/cubeview.h
index 04238f58d..04238f58d 100644
--- a/examples/tutorials/cube1/cubeview.h
+++ b/examples/qt3d/tutorials/cube1/cubeview.h
diff --git a/examples/tutorials/cube1/main.cpp b/examples/qt3d/tutorials/cube1/main.cpp
index 28fc9bb15..28fc9bb15 100644
--- a/examples/tutorials/cube1/main.cpp
+++ b/examples/qt3d/tutorials/cube1/main.cpp
diff --git a/examples/tutorials/cube2/cube2.pro b/examples/qt3d/tutorials/cube2/cube2.pro
index 3bf258831..3bf258831 100644
--- a/examples/tutorials/cube2/cube2.pro
+++ b/examples/qt3d/tutorials/cube2/cube2.pro
diff --git a/examples/tutorials/cube2/cubeview.cpp b/examples/qt3d/tutorials/cube2/cubeview.cpp
index 1dca459a8..1dca459a8 100644
--- a/examples/tutorials/cube2/cubeview.cpp
+++ b/examples/qt3d/tutorials/cube2/cubeview.cpp
diff --git a/examples/tutorials/cube2/cubeview.h b/examples/qt3d/tutorials/cube2/cubeview.h
index 04238f58d..04238f58d 100644
--- a/examples/tutorials/cube2/cubeview.h
+++ b/examples/qt3d/tutorials/cube2/cubeview.h
diff --git a/examples/tutorials/cube2/main.cpp b/examples/qt3d/tutorials/cube2/main.cpp
index 28fc9bb15..28fc9bb15 100644
--- a/examples/tutorials/cube2/main.cpp
+++ b/examples/qt3d/tutorials/cube2/main.cpp
diff --git a/examples/tutorials/cube3/cube3.pro b/examples/qt3d/tutorials/cube3/cube3.pro
index 70b049fe2..70b049fe2 100644
--- a/examples/tutorials/cube3/cube3.pro
+++ b/examples/qt3d/tutorials/cube3/cube3.pro
diff --git a/examples/tutorials/cube3/cubeview.cpp b/examples/qt3d/tutorials/cube3/cubeview.cpp
index 80c3e0f1a..80c3e0f1a 100644
--- a/examples/tutorials/cube3/cubeview.cpp
+++ b/examples/qt3d/tutorials/cube3/cubeview.cpp
diff --git a/examples/tutorials/cube3/cubeview.h b/examples/qt3d/tutorials/cube3/cubeview.h
index 04238f58d..04238f58d 100644
--- a/examples/tutorials/cube3/cubeview.h
+++ b/examples/qt3d/tutorials/cube3/cubeview.h
diff --git a/examples/tutorials/cube3/main.cpp b/examples/qt3d/tutorials/cube3/main.cpp
index 28fc9bb15..28fc9bb15 100644
--- a/examples/tutorials/cube3/main.cpp
+++ b/examples/qt3d/tutorials/cube3/main.cpp
diff --git a/examples/tutorials/cube4/cube.qml b/examples/qt3d/tutorials/cube4/cube.qml
index d4ba6d995..d4ba6d995 100644
--- a/examples/tutorials/cube4/cube.qml
+++ b/examples/qt3d/tutorials/cube4/cube.qml
diff --git a/examples/tutorials/cube4/cube.qrc b/examples/qt3d/tutorials/cube4/cube.qrc
index 70f5024d9..70f5024d9 100644
--- a/examples/tutorials/cube4/cube.qrc
+++ b/examples/qt3d/tutorials/cube4/cube.qrc
diff --git a/examples/tutorials/cube4/cube4.pro b/examples/qt3d/tutorials/cube4/cube4.pro
index a2f4ba79c..a2f4ba79c 100644
--- a/examples/tutorials/cube4/cube4.pro
+++ b/examples/qt3d/tutorials/cube4/cube4.pro
diff --git a/examples/tutorials/cube4/cubeview.cpp b/examples/qt3d/tutorials/cube4/cubeview.cpp
index e3045292b..e3045292b 100644
--- a/examples/tutorials/cube4/cubeview.cpp
+++ b/examples/qt3d/tutorials/cube4/cubeview.cpp
diff --git a/examples/tutorials/cube4/cubeview.h b/examples/qt3d/tutorials/cube4/cubeview.h
index 4f00216ca..4f00216ca 100644
--- a/examples/tutorials/cube4/cubeview.h
+++ b/examples/qt3d/tutorials/cube4/cubeview.h
diff --git a/examples/tutorials/cube4/main.cpp b/examples/qt3d/tutorials/cube4/main.cpp
index 28fc9bb15..28fc9bb15 100644
--- a/examples/tutorials/cube4/main.cpp
+++ b/examples/qt3d/tutorials/cube4/main.cpp
diff --git a/examples/nesting/qtlogo.png b/examples/qt3d/tutorials/cube4/qtlogo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/examples/nesting/qtlogo.png
+++ b/examples/qt3d/tutorials/cube4/qtlogo.png
diff --git a/examples/tutorials/penguin/main.cpp b/examples/qt3d/tutorials/penguin/main.cpp
index e5c995db3..e5c995db3 100644
--- a/examples/tutorials/penguin/main.cpp
+++ b/examples/qt3d/tutorials/penguin/main.cpp
diff --git a/examples/tutorials/penguin/model.qrc b/examples/qt3d/tutorials/penguin/model.qrc
index 2c330de09..2c330de09 100644
--- a/examples/tutorials/penguin/model.qrc
+++ b/examples/qt3d/tutorials/penguin/model.qrc
diff --git a/examples/tutorials/penguin/modelview.cpp b/examples/qt3d/tutorials/penguin/modelview.cpp
index 3ba6b7355..3ba6b7355 100644
--- a/examples/tutorials/penguin/modelview.cpp
+++ b/examples/qt3d/tutorials/penguin/modelview.cpp
diff --git a/examples/tutorials/penguin/modelview.h b/examples/qt3d/tutorials/penguin/modelview.h
index 978b185f8..978b185f8 100644
--- a/examples/tutorials/penguin/modelview.h
+++ b/examples/qt3d/tutorials/penguin/modelview.h
diff --git a/demos/declarative/monkeygod/meshes/penguin.3ds b/examples/qt3d/tutorials/penguin/penguin.3ds
index 26c09ac07..26c09ac07 100644
--- a/demos/declarative/monkeygod/meshes/penguin.3ds
+++ b/examples/qt3d/tutorials/penguin/penguin.3ds
diff --git a/examples/tutorials/penguin/penguin.pro b/examples/qt3d/tutorials/penguin/penguin.pro
index f35c1cd4e..f35c1cd4e 100644
--- a/examples/tutorials/penguin/penguin.pro
+++ b/examples/qt3d/tutorials/penguin/penguin.pro
diff --git a/examples/tutorials/penguin_advanced/main.cpp b/examples/qt3d/tutorials/penguin_advanced/main.cpp
index e5c995db3..e5c995db3 100644
--- a/examples/tutorials/penguin_advanced/main.cpp
+++ b/examples/qt3d/tutorials/penguin_advanced/main.cpp
diff --git a/examples/tutorials/penguin_advanced/model_advanced.qrc b/examples/qt3d/tutorials/penguin_advanced/model_advanced.qrc
index 2c330de09..2c330de09 100644
--- a/examples/tutorials/penguin_advanced/model_advanced.qrc
+++ b/examples/qt3d/tutorials/penguin_advanced/model_advanced.qrc
diff --git a/examples/tutorials/penguin_advanced/modelview.cpp b/examples/qt3d/tutorials/penguin_advanced/modelview.cpp
index a72495331..a72495331 100644
--- a/examples/tutorials/penguin_advanced/modelview.cpp
+++ b/examples/qt3d/tutorials/penguin_advanced/modelview.cpp
diff --git a/examples/tutorials/penguin_advanced/modelview.h b/examples/qt3d/tutorials/penguin_advanced/modelview.h
index 38b4340cc..38b4340cc 100644
--- a/examples/tutorials/penguin_advanced/modelview.h
+++ b/examples/qt3d/tutorials/penguin_advanced/modelview.h
diff --git a/examples/tutorials/penguin/penguin.3ds b/examples/qt3d/tutorials/penguin_advanced/penguin.3ds
index 26c09ac07..26c09ac07 100644
--- a/examples/tutorials/penguin/penguin.3ds
+++ b/examples/qt3d/tutorials/penguin_advanced/penguin.3ds
diff --git a/examples/tutorials/penguin_advanced/penguin_advanced.pro b/examples/qt3d/tutorials/penguin_advanced/penguin_advanced.pro
index 079c5f5b0..079c5f5b0 100644
--- a/examples/tutorials/penguin_advanced/penguin_advanced.pro
+++ b/examples/qt3d/tutorials/penguin_advanced/penguin_advanced.pro
diff --git a/examples/tutorials/shaders/TutorialTeapot.qml b/examples/qt3d/tutorials/shaders/TutorialTeapot.qml
index 5f2c29e08..5f2c29e08 100644
--- a/examples/tutorials/shaders/TutorialTeapot.qml
+++ b/examples/qt3d/tutorials/shaders/TutorialTeapot.qml
diff --git a/examples/tutorials/shaders/meshes b/examples/qt3d/tutorials/shaders/meshes
index 3bc225c36..3bc225c36 120000
--- a/examples/tutorials/shaders/meshes
+++ b/examples/qt3d/tutorials/shaders/meshes
diff --git a/examples/tutorials/shaders/shader-tutorial-1-textures.qml b/examples/qt3d/tutorials/shaders/shader-tutorial-1-textures.qml
index 081a94c0f..081a94c0f 100644
--- a/examples/tutorials/shaders/shader-tutorial-1-textures.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial-1-textures.qml
diff --git a/examples/tutorials/shaders/shader-tutorial-2-vertex-shader.qml b/examples/qt3d/tutorials/shaders/shader-tutorial-2-vertex-shader.qml
index 37f9ddfde..37f9ddfde 100644
--- a/examples/tutorials/shaders/shader-tutorial-2-vertex-shader.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial-2-vertex-shader.qml
diff --git a/examples/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml b/examples/qt3d/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml
index 6b3595c5d..6b3595c5d 100644
--- a/examples/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml
diff --git a/examples/tutorials/shaders/shader-tutorial-lighting.qml b/examples/qt3d/tutorials/shaders/shader-tutorial-lighting.qml
index 94bcee74d..94bcee74d 100644
--- a/examples/tutorials/shaders/shader-tutorial-lighting.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial-lighting.qml
diff --git a/examples/tutorials/shaders/shader-tutorial-varying.qml b/examples/qt3d/tutorials/shaders/shader-tutorial-varying.qml
index 3341bb7b5..3341bb7b5 100644
--- a/examples/tutorials/shaders/shader-tutorial-varying.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial-varying.qml
diff --git a/examples/tutorials/shaders/shader-tutorial.qml b/examples/qt3d/tutorials/shaders/shader-tutorial.qml
index 37d379bb8..37d379bb8 100644
--- a/examples/tutorials/shaders/shader-tutorial.qml
+++ b/examples/qt3d/tutorials/shaders/shader-tutorial.qml
diff --git a/examples/tutorials/shaders/shaders.pro b/examples/qt3d/tutorials/shaders/shaders.pro
index 05755ad8a..05755ad8a 100644
--- a/examples/tutorials/shaders/shaders.pro
+++ b/examples/qt3d/tutorials/shaders/shaders.pro
diff --git a/examples/tutorials/shaders/shaders.qmlproject b/examples/qt3d/tutorials/shaders/shaders.qmlproject
index d4909f868..d4909f868 100644
--- a/examples/tutorials/shaders/shaders.qmlproject
+++ b/examples/qt3d/tutorials/shaders/shaders.qmlproject
diff --git a/examples/tutorials/shaders/textures/basket.jpg b/examples/qt3d/tutorials/shaders/textures/basket.jpg
index b23d4eec4..b23d4eec4 120000
--- a/examples/tutorials/shaders/textures/basket.jpg
+++ b/examples/qt3d/tutorials/shaders/textures/basket.jpg
diff --git a/examples/tutorials/shaders/textures/qtlogo.png b/examples/qt3d/tutorials/shaders/textures/qtlogo.png
index b8b931c8b..b8b931c8b 120000
--- a/examples/tutorials/shaders/textures/qtlogo.png
+++ b/examples/qt3d/tutorials/shaders/textures/qtlogo.png
diff --git a/examples/tutorials/teapot-qml/teapot-bounce.qml b/examples/qt3d/tutorials/teapot-qml/teapot-bounce.qml
index 7a9e61e69..7a9e61e69 100644
--- a/examples/tutorials/teapot-qml/teapot-bounce.qml
+++ b/examples/qt3d/tutorials/teapot-qml/teapot-bounce.qml
diff --git a/examples/tutorials/teapot-qml/teapot-qml.qmlproject b/examples/qt3d/tutorials/teapot-qml/teapot-qml.qmlproject
index d4909f868..d4909f868 100644
--- a/examples/tutorials/teapot-qml/teapot-qml.qmlproject
+++ b/examples/qt3d/tutorials/teapot-qml/teapot-qml.qmlproject
diff --git a/demos/declarative/meshes/teapot.bez b/examples/qt3d/tutorials/teapot-qml/teapot.bez
index 02b2ac447..02b2ac447 100644
--- a/demos/declarative/meshes/teapot.bez
+++ b/examples/qt3d/tutorials/teapot-qml/teapot.bez
diff --git a/examples/tutorials/teapot-qml/teapot.qml b/examples/qt3d/tutorials/teapot-qml/teapot.qml
index 97e0bdf56..97e0bdf56 100644
--- a/examples/tutorials/teapot-qml/teapot.qml
+++ b/examples/qt3d/tutorials/teapot-qml/teapot.qml
diff --git a/examples/tutorials/tutorials.pro b/examples/qt3d/tutorials/tutorials.pro
index 8c3fdf364..8c3fdf364 100644
--- a/examples/tutorials/tutorials.pro
+++ b/examples/qt3d/tutorials/tutorials.pro
diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro
new file mode 100644
index 000000000..da107aa20
--- /dev/null
+++ b/examples/quick3d/basket/basket.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+QML_IMPORT_PATH = $$[QT_INSTALL_IMPORTS]/Qt3D
+SOURCES += main.cpp
diff --git a/examples/quick3d/basket/main.cpp b/examples/quick3d/basket/main.cpp
new file mode 100644
index 000000000..33093a986
--- /dev/null
+++ b/examples/quick3d/basket/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/basket.qml")));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/basket.qml b/examples/quick3d/basket/qml/basket.qml
index 910cc146b..910cc146b 100644
--- a/demos/declarative/basket.qml
+++ b/examples/quick3d/basket/qml/basket.qml
diff --git a/examples/quick3d/bounce/bounce.pro b/examples/quick3d/bounce/bounce.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/bounce/bounce.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/bounce/main.cpp b/examples/quick3d/bounce/main.cpp
new file mode 100644
index 000000000..c9fd2f1b9
--- /dev/null
+++ b/examples/quick3d/bounce/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/bounce.qml")));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/teapot-bounce.qml b/examples/quick3d/bounce/qml/bounce.qml
index 7abfe76d8..7abfe76d8 100644
--- a/demos/declarative/teapot-bounce.qml
+++ b/examples/quick3d/bounce/qml/bounce.qml
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/cube/cube.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/cube/main.cpp b/examples/quick3d/cube/main.cpp
new file mode 100644
index 000000000..c9e7fb7d5
--- /dev/null
+++ b/examples/quick3d/cube/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/cube.qml")));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/cube.qml b/examples/quick3d/cube/qml/cube.qml
index 11579dd28..11579dd28 100644
--- a/demos/declarative/cube.qml
+++ b/examples/quick3d/cube/qml/cube.qml
diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/forest/forest.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/forest/main.cpp b/examples/quick3d/forest/main.cpp
new file mode 100644
index 000000000..146ea06c8
--- /dev/null
+++ b/examples/quick3d/forest/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/forest.qml")));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/forest/Tree.qml b/examples/quick3d/forest/qml/Tree.qml
index 0657d51ad..0657d51ad 100644
--- a/demos/declarative/forest/Tree.qml
+++ b/examples/quick3d/forest/qml/Tree.qml
diff --git a/demos/declarative/forest/forest.qml b/examples/quick3d/forest/qml/forest.qml
index 8b0fd545a..8b0fd545a 100644
--- a/demos/declarative/forest/forest.qml
+++ b/examples/quick3d/forest/qml/forest.qml
diff --git a/demos/declarative/forest/ground.obj b/examples/quick3d/forest/qml/ground.obj
index d13a931a2..d13a931a2 100644
--- a/demos/declarative/forest/ground.obj
+++ b/examples/quick3d/forest/qml/ground.obj
diff --git a/demos/declarative/forest/tree.obj b/examples/quick3d/forest/qml/tree.obj
index 6dd72d7b9..6dd72d7b9 100644
--- a/demos/declarative/forest/tree.obj
+++ b/examples/quick3d/forest/qml/tree.obj
diff --git a/demos/declarative/forest/tree.png b/examples/quick3d/forest/qml/tree.png
index c6a27748f..c6a27748f 100644
--- a/demos/declarative/forest/tree.png
+++ b/examples/quick3d/forest/qml/tree.png
diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/lander/lander.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/lander/main.cpp b/examples/quick3d/lander/main.cpp
new file mode 100644
index 000000000..9439b25fe
--- /dev/null
+++ b/examples/quick3d/lander/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/lander.qml")));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/lander/flame.png b/examples/quick3d/lander/qml/flame.png
index 503c310b1..503c310b1 100644
--- a/demos/declarative/lander/flame.png
+++ b/examples/quick3d/lander/qml/flame.png
diff --git a/examples/quick3d/lander/qml/flame.xcf b/examples/quick3d/lander/qml/flame.xcf
new file mode 100644
index 000000000..bc6a423ad
--- /dev/null
+++ b/examples/quick3d/lander/qml/flame.xcf
diff --git a/demos/declarative/lander/flame2.png b/examples/quick3d/lander/qml/flame2.png
index a3913623c..a3913623c 100644
--- a/demos/declarative/lander/flame2.png
+++ b/examples/quick3d/lander/qml/flame2.png
diff --git a/examples/quick3d/lander/qml/flame2.xcf b/examples/quick3d/lander/qml/flame2.xcf
new file mode 100644
index 000000000..2cdf4367a
--- /dev/null
+++ b/examples/quick3d/lander/qml/flame2.xcf
diff --git a/demos/declarative/lander/lander.qml b/examples/quick3d/lander/qml/lander.qml
index a7306f671..a7306f671 100644
--- a/demos/declarative/lander/lander.qml
+++ b/examples/quick3d/lander/qml/lander.qml
diff --git a/demos/declarative/lander/lunar-lander.3ds b/examples/quick3d/lander/qml/lunar-lander.3ds
index eab75bc53..eab75bc53 100644
--- a/demos/declarative/lander/lunar-lander.3ds
+++ b/examples/quick3d/lander/qml/lunar-lander.3ds
diff --git a/demos/declarative/lander/rusty.png b/examples/quick3d/lander/qml/rusty.png
index b85ad7c9c..b85ad7c9c 100644
--- a/demos/declarative/lander/rusty.png
+++ b/examples/quick3d/lander/qml/rusty.png
diff --git a/examples/quick3d/matrix_animation/main.cpp b/examples/quick3d/matrix_animation/main.cpp
new file mode 100644
index 000000000..550106230
--- /dev/null
+++ b/examples/quick3d/matrix_animation/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/matrix-animation.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/matrix_animation/matrix_animation.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/matrix-animation.qml b/examples/quick3d/matrix_animation/qml/matrix-animation.qml
index 78bd71d22..78bd71d22 100644
--- a/demos/declarative/matrix-animation.qml
+++ b/examples/quick3d/matrix_animation/qml/matrix-animation.qml
diff --git a/examples/quick3d/monkeygod/main.cpp b/examples/quick3d/monkeygod/main.cpp
new file mode 100644
index 000000000..e8ad034ca
--- /dev/null
+++ b/examples/quick3d/monkeygod/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/monkeygod.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/monkeygod/monkeygod.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/monkeygod/Penguin.qml b/examples/quick3d/monkeygod/qml/Penguin.qml
index 394110840..394110840 100644
--- a/demos/declarative/monkeygod/Penguin.qml
+++ b/examples/quick3d/monkeygod/qml/Penguin.qml
diff --git a/demos/declarative/monkeygod/meshes/monkey.3ds b/examples/quick3d/monkeygod/qml/meshes/monkey.3ds
index e9a007b20..e9a007b20 100644
--- a/demos/declarative/monkeygod/meshes/monkey.3ds
+++ b/examples/quick3d/monkeygod/qml/meshes/monkey.3ds
diff --git a/examples/tutorials/penguin_advanced/penguin.3ds b/examples/quick3d/monkeygod/qml/meshes/penguin.3ds
index 26c09ac07..26c09ac07 100644
--- a/examples/tutorials/penguin_advanced/penguin.3ds
+++ b/examples/quick3d/monkeygod/qml/meshes/penguin.3ds
diff --git a/demos/declarative/monkeygod/monkeygod.qml b/examples/quick3d/monkeygod/qml/monkeygod.qml
index 0782f5e5f..0782f5e5f 100644
--- a/demos/declarative/monkeygod/monkeygod.qml
+++ b/examples/quick3d/monkeygod/qml/monkeygod.qml
diff --git a/demos/declarative/monkeygod/monkeygod_no_platform.qml b/examples/quick3d/monkeygod/qml/monkeygod_no_platform.qml
index eb2ee3fa4..eb2ee3fa4 100644
--- a/demos/declarative/monkeygod/monkeygod_no_platform.qml
+++ b/examples/quick3d/monkeygod/qml/monkeygod_no_platform.qml
diff --git a/examples/quick3d/moon/main.cpp b/examples/quick3d/moon/main.cpp
new file mode 100644
index 000000000..922cdf24d
--- /dev/null
+++ b/examples/quick3d/moon/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/moon.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/moon/moon.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/moon/moon-texture.jpg b/examples/quick3d/moon/qml/moon-texture.jpg
index b6955e389..b6955e389 100644
--- a/demos/declarative/moon/moon-texture.jpg
+++ b/examples/quick3d/moon/qml/moon-texture.jpg
diff --git a/demos/declarative/moon/moon.qml b/examples/quick3d/moon/qml/moon.qml
index e8d265e45..e8d265e45 100644
--- a/demos/declarative/moon/moon.qml
+++ b/examples/quick3d/moon/qml/moon.qml
diff --git a/examples/quick3d/photopane/main.cpp b/examples/quick3d/photopane/main.cpp
new file mode 100644
index 000000000..e729842b9
--- /dev/null
+++ b/examples/quick3d/photopane/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/photopane.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/photopane/photopane.pro b/examples/quick3d/photopane/photopane.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/photopane/photopane.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/PhotoPane.qml b/examples/quick3d/photopane/qml/photopane.qml
index 1b22c8f07..1b22c8f07 100644
--- a/demos/declarative/PhotoPane.qml
+++ b/examples/quick3d/photopane/qml/photopane.qml
diff --git a/examples/quick3d/photoroom/main.cpp b/examples/quick3d/photoroom/main.cpp
new file mode 100644
index 000000000..1bb9eb978
--- /dev/null
+++ b/examples/quick3d/photoroom/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/photoroom.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/photoroom/photoroom.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/demos/declarative/photoroom.qml b/examples/quick3d/photoroom/qml/photoroom.qml
index 120ad0a29..120ad0a29 100644
--- a/demos/declarative/photoroom.qml
+++ b/examples/quick3d/photoroom/qml/photoroom.qml
diff --git a/examples/quick3d/quick3d.pro b/examples/quick3d/quick3d.pro
new file mode 100644
index 000000000..7e70381af
--- /dev/null
+++ b/examples/quick3d/quick3d.pro
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    basket \
+    bounce \
+    cube \
+    forest \
+    lander \
+    matrix_animation \
+    monkeygod \
+    moon \
+    photopane \
+    photoroom \
+    shaders \
+    sphere \
+    teapot
+
diff --git a/examples/quick3d/shaders/main.cpp b/examples/quick3d/shaders/main.cpp
new file mode 100644
index 000000000..53d6ce64c
--- /dev/null
+++ b/examples/quick3d/shaders/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/shaders.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/examples/quick3d/shaders/qml/Animation.qml b/examples/quick3d/shaders/qml/Animation.qml
new file mode 100644
index 000000000..4bfa01b8e
--- /dev/null
+++ b/examples/quick3d/shaders/qml/Animation.qml
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D 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 Qt 4.7
+import Qt3D 1.0
+
+Viewport {
+    width: 640; height: 480
+
+    property string name: "Animation Shader"
+    property string icon: "images/teapot-logo.png"
+    property bool run: false
+
+    Item3D {
+        mesh: Mesh { source: "meshes/teapot.bez" }
+        effect: program
+
+        transform: Rotation3D {
+            NumberAnimation on angle{
+                running: run
+                loops: Animation.Infinite
+                from: 0
+                to: 360
+                duration: 18000
+            }
+            axis: Qt.vector3d(1, -0.3, 0)
+        }
+
+        ShaderProgram {
+            id: program
+            property real qt_Custom : 1.0
+            SequentialAnimation on qt_Custom {
+                running: run
+                loops: Animation.Infinite
+                PauseAnimation { duration: 700 }
+                NumberAnimation { from: 1.0; to: 0.001; duration: 1500; easing.type:"OutBounce" }
+                PauseAnimation { duration: 700 }
+                NumberAnimation { from: 0.001; to: 1.0; duration: 1500; easing.type:"OutBounce" }
+            }
+
+            texture: "images/qtlogo.png"
+
+            SequentialAnimation on color {
+                running: run
+                loops: Animation.Infinite
+                ColorAnimation {
+                    from: "#00008a"
+                    to: "#003333"
+                    duration: 5000
+                }
+                ColorAnimation {
+                    from: "#003333"
+                    to: "#00008a"
+                    duration: 5000
+                }
+            }
+
+            vertexShader: "
+                attribute highp vec4 qt_Vertex;
+                attribute highp vec4 qt_MultiTexCoord0;
+                uniform mediump mat4 qt_ModelViewProjectionMatrix;
+                varying highp vec4 texCoord;
+                uniform highp float qt_Custom;
+
+                void main(void)
+                {
+                    gl_Position = qt_ModelViewProjectionMatrix * (qt_Vertex *
+                    vec4(1.0, qt_Custom, 1.0, 1.0));
+                    texCoord =  -qt_MultiTexCoord0 + vec4(qt_Custom, 0.0, 0.0, 0.0);
+
+                }
+                "
+            fragmentShader: "
+                varying highp vec4 texCoord;
+                uniform sampler2D qt_Texture0;
+                uniform mediump vec4 qt_Color;
+
+                void main(void)
+                {
+                    mediump vec4 col = texture2D(qt_Texture0, texCoord.st);
+                    gl_FragColor = vec4(clamp(qt_Color.rgb * (1.0 - col.a) +
+                    col.rgb, 0.0, 1.0), 1.0);
+                }
+                "
+        }
+    }
+}
diff --git a/examples/quick3d/shaders/qml/Collapsing.qml b/examples/quick3d/shaders/qml/Collapsing.qml
new file mode 100644
index 000000000..42cdf41e5
--- /dev/null
+++ b/examples/quick3d/shaders/qml/Collapsing.qml
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D 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 Qt 4.7
+import Qt3D 1.0
+
+Viewport {
+    property string name: "Collapsing Shader"
+    property string icon: "images/teapot-logo.png"
+
+    width: 640; height: 480
+
+    Item3D {
+        mesh: Mesh { source: "meshes/teapot.bez" }
+        effect: program
+
+        transform: Rotation3D {
+            NumberAnimation on angle{
+                running: true
+                loops: Animation.Infinite
+                from: 0
+                to: 360
+                duration: 8000
+            }
+            axis: Qt.vector3d(1, -0.3, 0)
+        }
+
+        ShaderProgram {
+            id: program
+            property real collapseFactor : 0.0
+
+            SequentialAnimation on collapseFactor {
+                running: true
+                loops: Animation.Infinite
+                PauseAnimation { duration: 700 }
+                NumberAnimation { from: 0.0; to: 1.0; duration: 1500; easing.type:"OutBounce" }
+                PauseAnimation { duration: 700 }
+                NumberAnimation { from: 1.0; to: 0.0; duration: 1500; easing.type:"OutBounce" }
+            }
+            texture: "images/qtlogo.png"
+
+            SequentialAnimation on color{
+                running: true
+                loops: Animation.Infinite
+                ColorAnimation {
+                    from: "#00008a"
+                    to: "#003333"
+                    duration: 5000
+                }
+                ColorAnimation {
+                    from: "#003333"
+                    to: "#00008a"
+                    duration: 5000
+                }
+            }
+
+            vertexShader: "
+                attribute highp vec4 qt_Vertex;
+                attribute highp vec4 qt_MultiTexCoord0;
+                uniform mediump mat4 qt_ModelViewProjectionMatrix;
+                varying highp vec4 texCoord;
+                uniform highp float collapseFactor;
+
+                void main(void)
+                {
+                    // Interpolate between the actual position of the input vertex
+                    // and treating the tex-coordinates as vertex positions to
+                    // create a neat collapsing effect.
+                    vec4 workingPosition = mix( qt_Vertex, vec4(-qt_MultiTexCoord0.xyz, 1.0) , collapseFactor);
+                    gl_Position = qt_ModelViewProjectionMatrix * workingPosition;
+                    texCoord =  -qt_MultiTexCoord0;
+                }
+                "
+            fragmentShader: "
+                varying highp vec4 texCoord;
+                uniform sampler2D qt_Texture0;
+                uniform mediump vec4 qt_Color;
+
+                void main(void)
+                {
+                    mediump vec4 col = texture2D(qt_Texture0, texCoord.st);
+                    gl_FragColor = vec4(clamp(qt_Color.rgb * (1.0 - col.a) +
+                    col.rgb, 0.0, 1.0), 1.0);
+                }
+                "
+        }
+    }
+}
diff --git a/demos/declarative/teapot-shader-images.qml b/examples/quick3d/shaders/qml/Images.qml
index 292c7f940..0ca21e640 100644
--- a/demos/declarative/teapot-shader-images.qml
+++ b/examples/quick3d/shaders/qml/Images.qml
@@ -42,16 +42,18 @@ import Qt 4.7
 import Qt3D 1.0
 
 Rectangle {
+    property string name: "Images Shader"
+    property string icon: "images/teapot-logo.png"
+
     width: 640; height: 480
     id: top
     color: "black"
 
     property bool flag : true
 
-    // This is a the Qt Logo fetched from wikipedia.
     property string imageUrl: flag ?
-            "http://upload.wikimedia.org/wikipedia/en/thumb/4/4e/Qt_Development_Frameworks_logo.svg/220px-Qt_Development_Frameworks_logo.svg.png" :
-            "textures/basket.jpg"
+            "images/qtlogo.png" :
+            "images/basket.jpg"
 
     Image {
         id: myChangingImage
@@ -92,7 +94,7 @@ Rectangle {
 
             // Default texture that the shaderprogram will get until something else
             // is bound:
-            texture: "textures/qtlogo.png"
+            texture: "images/qtlogo.png"
 
             // This property is automatically hooked up to the image uniform
             // in the shader program below.
diff --git a/examples/quick3d/shaders/qml/Interpolate.qml b/examples/quick3d/shaders/qml/Interpolate.qml
new file mode 100644
index 000000000..e45caba51
--- /dev/null
+++ b/examples/quick3d/shaders/qml/Interpolate.qml
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D 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 Qt 4.7
+import Qt3D 1.0
+
+Viewport {
+    property string name: "Interpolate Shader"
+    property string icon: "images/teapot-logo.png"
+
+    width: 640; height: 480
+
+    Item3D {
+        mesh: Mesh { source: "meshes/teapot.bez" }
+        effect: program
+
+        transform: Rotation3D {
+            NumberAnimation on angle{
+                running: true
+                loops: Animation.Infinite
+                from: 0
+                to: 360
+                duration: 5000
+            }
+            axis: Qt.vector3d(1, -0.3, 0)
+        }
+
+        ShaderProgram {
+            id: program
+            texture: "images/basket.jpg"
+            property variant texture2 : "images/qtlogo.png"
+            property real interpolationFactor : 1.0
+
+            SequentialAnimation on interpolationFactor {
+                running: true
+                loops: Animation.Infinite
+                NumberAnimation { to : 1.0; duration: 750; }
+
+
+                PauseAnimation { duration: 550 }
+                NumberAnimation { to : 0.0; duration: 750; }
+                PauseAnimation { duration: 550 }
+            }
+
+            SequentialAnimation on color{
+                running: true
+                loops: Animation.Infinite
+                ColorAnimation {
+                    from: "#aaca00"
+                    to: "#0033ca"
+                    duration: 500
+                }
+                ColorAnimation {
+                    from: "#0033ca"
+                    to: "#aaca00"
+                    duration: 500
+                }
+            }
+
+            vertexShader: "
+                attribute highp vec4 qt_Vertex;
+                attribute highp vec4 qt_MultiTexCoord0;
+                uniform mediump mat4 qt_ModelViewProjectionMatrix;
+                varying highp vec4 texCoord;
+
+                void main(void)
+                {
+                    gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
+                    texCoord = qt_MultiTexCoord0;
+                }
+                "
+
+            fragmentShader: "
+                varying highp vec4 texCoord;
+                uniform sampler2D qt_Texture0;
+                uniform sampler2D texture2;
+                uniform mediump vec4 qt_Color;
+                uniform mediump float interpolationFactor;
+
+                void main(void)
+                {
+                    mediump vec4 col1 = texture2D(qt_Texture0, texCoord.st);
+                    mediump vec4 col2 = texture2D(texture2, texCoord.st);
+                    gl_FragColor = mix(col1, col2, interpolationFactor);
+                }
+                "
+        }
+    }
+}
diff --git a/examples/basket/basket.jpg b/examples/quick3d/shaders/qml/images/basket.jpg
index 438e7a0c2..438e7a0c2 100644
--- a/examples/basket/basket.jpg
+++ b/examples/quick3d/shaders/qml/images/basket.jpg
diff --git a/examples/tutorials/cube4/qtlogo.png b/examples/quick3d/shaders/qml/images/qtlogo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/examples/tutorials/cube4/qtlogo.png
+++ b/examples/quick3d/shaders/qml/images/qtlogo.png
diff --git a/examples/quick3d/shaders/qml/images/teapot-logo.png b/examples/quick3d/shaders/qml/images/teapot-logo.png
new file mode 100644
index 000000000..39f02e51d
--- /dev/null
+++ b/examples/quick3d/shaders/qml/images/teapot-logo.png
diff --git a/examples/tutorials/teapot-qml/teapot.bez b/examples/quick3d/shaders/qml/meshes/teapot.bez
index 02b2ac447..02b2ac447 100644
--- a/examples/tutorials/teapot-qml/teapot.bez
+++ b/examples/quick3d/shaders/qml/meshes/teapot.bez
diff --git a/examples/quick3d/shaders/qml/shaders.qml b/examples/quick3d/shaders/qml/shaders.qml
new file mode 100644
index 000000000..4b6237797
--- /dev/null
+++ b/examples/quick3d/shaders/qml/shaders.qml
@@ -0,0 +1,93 @@
+import Qt 4.7
+
+Rectangle {
+    property int current : 0
+
+    Rectangle {
+        id: tabContentArea
+        width: parent.width
+
+        anchors.top: parent.top
+        anchors.bottom: tabBar.top
+        Repeater {
+            model: tabsModel
+        }
+    }
+
+    VisualItemModel {
+        id: tabsModel
+        Animation { }
+        Collapsing { }
+        Images { }
+        Interpolate { }
+    }
+
+    Rectangle {
+        id: tabButtonArea
+        height: 64
+        width: parent.width
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
+        gradient: Gradient {
+            GradientStop {position: 0.0; color: "#CCCCCC"}
+            GradientStop {position: 1.0; color: "#000000"}
+        }
+
+        Component {
+            id: tabButton
+            onStatusChanged:
+
+            function tabClicked(index)
+            {
+                tabs.children[current].color = "transparent";
+                tabsModel.children[current].visible = false;
+                current = index;
+                tabs.children[current].color = "#30ffffff";
+                tabsModel.children[current].visible = true;
+            }
+
+            Rectangle {
+                height: tabButtonArea.height
+                width: tabs.width / tabsModel.count
+
+                color: "transparent"
+
+                Image {
+                    source: tabsModel.children[index].icon
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.top: parent.top
+                    anchors.topMargin: 4
+                }
+
+                Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: 4
+                    color: "white"
+                    text: tabsModel.children[index].name
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        tabClicked(index);
+                    }
+                }
+            }
+        }
+
+        Row {
+            id: tabs
+            anchors.fill: parent
+            Repeater {
+                model: tabsModel.count
+                delegate: tabButton
+            }
+        }
+    }
+
+    Component.onCompleted:
+}
diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/shaders/shaders.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/sphere/main.cpp b/examples/quick3d/sphere/main.cpp
new file mode 100644
index 000000000..1bb9eb978
--- /dev/null
+++ b/examples/quick3d/sphere/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/photoroom.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/sphere.qml b/examples/quick3d/sphere/qml/sphere.qml
index b6adacb30..b6adacb30 100644
--- a/demos/declarative/sphere.qml
+++ b/examples/quick3d/sphere/qml/sphere.qml
diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/sphere/sphere.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/teapot/main.cpp b/examples/quick3d/teapot/main.cpp
new file mode 100644
index 000000000..731d04d0e
--- /dev/null
+++ b/examples/quick3d/teapot/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/teapot.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/teapot.qml b/examples/quick3d/teapot/qml/teapot.qml
index ebb126c01..ebb126c01 100644
--- a/demos/declarative/teapot.qml
+++ b/examples/quick3d/teapot/qml/teapot.qml
diff --git a/examples/quick3d/teapot/teapot.pro b/examples/quick3d/teapot/teapot.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/teapot/teapot.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/examples/quick3d/textures/basket.jpg b/examples/quick3d/textures/basket.jpg
new file mode 100644
index 000000000..438e7a0c2
--- /dev/null
+++ b/examples/quick3d/textures/basket.jpg
diff --git a/demos/declarative/textures/button/face-name.png b/examples/quick3d/textures/button/face-name.png
index 280aa62f7..280aa62f7 100644
--- a/demos/declarative/textures/button/face-name.png
+++ b/examples/quick3d/textures/button/face-name.png
diff --git a/demos/declarative/textures/button/face-name.xcf b/examples/quick3d/textures/button/face-name.xcf
index ea733fce5..ea733fce5 100644
--- a/demos/declarative/textures/button/face-name.xcf
+++ b/examples/quick3d/textures/button/face-name.xcf
diff --git a/demos/declarative/meshes/face.png b/examples/quick3d/textures/button/face.png
index 327c88423..327c88423 100644
--- a/demos/declarative/meshes/face.png
+++ b/examples/quick3d/textures/button/face.png
diff --git a/demos/declarative/textures/button/full-address.png b/examples/quick3d/textures/button/full-address.png
index 8c83ac062..8c83ac062 100644
--- a/demos/declarative/textures/button/full-address.png
+++ b/examples/quick3d/textures/button/full-address.png
diff --git a/demos/declarative/textures/button/full-address.xcf b/examples/quick3d/textures/button/full-address.xcf
index 1b1815382..1b1815382 100644
--- a/demos/declarative/textures/button/full-address.xcf
+++ b/examples/quick3d/textures/button/full-address.xcf
diff --git a/demos/declarative/textures/button/woman-photo-credit.txt b/examples/quick3d/textures/button/woman-photo-credit.txt
index c7f04c1c9..c7f04c1c9 100644
--- a/demos/declarative/textures/button/woman-photo-credit.txt
+++ b/examples/quick3d/textures/button/woman-photo-credit.txt
diff --git a/demos/declarative/textures/button/woman.jpg b/examples/quick3d/textures/button/woman.jpg
index f3a6abc28..f3a6abc28 100644
--- a/demos/declarative/textures/button/woman.jpg
+++ b/examples/quick3d/textures/button/woman.jpg
diff --git a/examples/quick3d/textures/main.cpp b/examples/quick3d/textures/main.cpp
new file mode 100644
index 000000000..cdad31ad5
--- /dev/null
+++ b/examples/quick3d/textures/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtQuick3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/qdeclarativeview.h>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/model_viewer.qml"));
+
+    if (QApplication::arguments().contains(QLatin1String("-maximize")))
+        view.showMaximized();
+    else if (QApplication::arguments().contains(QLatin1String("-fullscreen")))
+        view.showFullScreen();
+    else
+        view.show();
+
+    return app.exec();
+}
diff --git a/demos/declarative/textures/photos/background.jpg b/examples/quick3d/textures/photos/background.jpg
index 9884233a2..9884233a2 100644
--- a/demos/declarative/textures/photos/background.jpg
+++ b/examples/quick3d/textures/photos/background.jpg
diff --git a/demos/declarative/textures/photos/niagara_falls.jpg b/examples/quick3d/textures/photos/niagara_falls.jpg
index 7a912d3b9..7a912d3b9 100644
--- a/demos/declarative/textures/photos/niagara_falls.jpg
+++ b/examples/quick3d/textures/photos/niagara_falls.jpg
diff --git a/demos/declarative/textures/photos/place.jpg b/examples/quick3d/textures/photos/place.jpg
index 03e534433..03e534433 100644
--- a/demos/declarative/textures/photos/place.jpg
+++ b/examples/quick3d/textures/photos/place.jpg
diff --git a/examples/quick3d/textures/qtlogo.png b/examples/quick3d/textures/qtlogo.png
new file mode 100644
index 000000000..7d3e97eb3
--- /dev/null
+++ b/examples/quick3d/textures/qtlogo.png
diff --git a/examples/quick3d/textures/textures.pro b/examples/quick3d/textures/textures.pro
new file mode 100644
index 000000000..dbae98a47
--- /dev/null
+++ b/examples/quick3d/textures/textures.pro
@@ -0,0 +1,4 @@
+qmlFiles.sources = qml
+DEPLOYMENT += qmlFiles
+
+SOURCES += main.cpp
diff --git a/src/imports/shapes/README.library_xml b/src/imports/shapes/README.library_xml
new file mode 100644
index 000000000..fcf50a9fc
--- /dev/null
+++ b/src/imports/shapes/README.library_xml
@@ -0,0 +1,13 @@
+The library.xml file is required to get syntax highlighting of Qt3D.Shapes 
+plugin items.  It is install into the imports/Qt3D.Shapes tree along with
+the plugin and the qmldir file.
+
+When any of the elements - property names, class names or other exports
+- in the Qt3D.Shapes plugin are changed this file will need to be regenerated.
+
+To generate the library.xml file see the scripts/README file for a
+description of how to use the filter-qmldump.pl script.
+
+This is a less-than-optimal solution but as syntax discovery improves
+in Qt Creator better solutions should become available at which time
+this temporary script and syntax file may be deprecated.
diff --git a/src/imports/shapes/library.xml b/src/imports/shapes/library.xml
new file mode 100644
index 000000000..636dc8465
--- /dev/null
+++ b/src/imports/shapes/library.xml
@@ -0,0 +1,55 @@
+Filtering for modules in Qt3D.Shapes
+<?xml version="1.0" encoding="UTF-8"?>
+<module>
+    <type name="Capsule" defaultProperty="data" extends="QDeclarativeItem3D">
+        <exports>
+            <export module="Qt3D.Shapes" version="1.0" type="Capsule" />
+        </exports>
+        <property name="radius" type="qreal" />
+        <property name="length" type="qreal" />
+        <property name="levelOfDetail" type="int" />
+        <signal name="radiusChanged" />
+        <signal name="lengthChanged" />
+        <signal name="levelOfDetailChanged" />
+    </type>
+    <type name="Cylinder" defaultProperty="data" extends="QDeclarativeItem3D">
+        <exports>
+            <export module="Qt3D.Shapes" version="1.0" type="Cylinder" />
+        </exports>
+        <property name="radius" type="qreal" />
+        <property name="length" type="qreal" />
+        <property name="levelOfDetail" type="int" />
+        <signal name="radiusChanged" />
+        <signal name="lengthChanged" />
+        <signal name="levelOfDetailChanged" />
+    </type>
+    <type name="Line" defaultProperty="data" extends="QDeclarativeItem3D">
+        <exports>
+            <export module="Qt3D.Shapes" version="1.0" type="Line" />
+        </exports>
+        <property name="width" type="qreal" />
+        <property name="vertices" type="QVariant" />
+        <signal name="verticesChanged" />
+        <signal name="widthChanged" />
+    </type>
+    <type name="Point" defaultProperty="data" extends="QDeclarativeItem3D">
+        <exports>
+            <export module="Qt3D.Shapes" version="1.0" type="Point" />
+        </exports>
+        <property name="pointSize" type="qreal" />
+        <property name="vertices" type="QVariant" />
+        <signal name="verticesChanged" />
+        <signal name="pointSizeChanged" />
+    </type>
+    <type name="Sphere" defaultProperty="data" extends="QDeclarativeItem3D">
+        <exports>
+            <export module="Qt3D.Shapes" version="1.0" type="Sphere" />
+        </exports>
+        <property name="radius" type="qreal" />
+        <property name="levelOfDetail" type="int" />
+        <property name="axis" type="Qt.Axis" />
+        <signal name="radiusChanged" />
+        <signal name="levelOfDetailChanged" />
+        <signal name="axisChanged" />
+    </type>
+<\module>
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index aff5bcc64..13fd24f78 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -33,12 +33,14 @@ HEADERS += \
 
 qdeclarativesources.files += \
     qmldir \
+    library.xml \
     Cube.qml \
     cube.obj \
     Quad.qml \
     quad.obj \
     Teapot.qml \
     teapot.bez
+# see the file README.library_xml for more on library.xml
 
 qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
 
diff --git a/demos/declarative/DefaultNavigator.qml b/src/imports/threed/DefaultNavigator.qml
index 70b0ac6b1..70b0ac6b1 100644
--- a/demos/declarative/DefaultNavigator.qml
+++ b/src/imports/threed/DefaultNavigator.qml
diff --git a/src/imports/threed/README.library_xml b/src/imports/threed/README.library_xml
new file mode 100644
index 000000000..b253f4b19
--- /dev/null
+++ b/src/imports/threed/README.library_xml
@@ -0,0 +1,13 @@
+The library.xml file is required to get syntax highlighting of Qt3D 
+plugin items.  It is install into the imports/Qt3D tree along with
+the plugin and the qmldir file.
+
+When any of the elements - property names, class names or other exports
+- in the Qt3D plugin are changed this file will need to be regenerated.
+
+To generate the library.xml file see the scripts/README file for a
+description of how to use the filter-qmldump.pl script.
+
+This is a less-than-optimal solution but as syntax discovery improves
+in Qt Creator better solutions should become available at which time
+this temporary script and syntax file may be deprecated.
diff --git a/src/imports/threed/library.xml b/src/imports/threed/library.xml
new file mode 100644
index 000000000..bc6866dd3
--- /dev/null
+++ b/src/imports/threed/library.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module>
+    <type name="QDeclarativeEffect" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Effect" />
+        </exports>
+        <property name="color" type="QColor" />
+        <property name="useLighting" type="bool" />
+        <property name="decal" type="bool" />
+        <property name="blending" type="bool" />
+        <property name="texture" type="QUrl" />
+        <property name="textureImage" type="QImage" />
+        <property name="material" type="QGLMaterial" />
+        <property name="progress" type="qreal" />
+        <signal name="effectChanged" />
+        <signal name="progressChanged">
+            <param name="progress" type="qreal" />
+        </signal>
+    </type>
+    <type name="QDeclarativeItem3D" defaultProperty="data" extends="QDeclarativeItem">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Item3D" />
+        </exports>
+        <enum name="CullFace">
+            <enumerator name="CullDisabled" value="0" />
+            <enumerator name="CullFrontFaces" value="1028" />
+            <enumerator name="CullBackFaces" value="1029" />
+            <enumerator name="CullAllFaces" value="1032" />
+            <enumerator name="CullClockwise" value="65536" />
+        </enum>
+        <enum name="CullFaces">
+            <enumerator name="CullDisabled" value="0" />
+            <enumerator name="CullFrontFaces" value="1028" />
+            <enumerator name="CullBackFaces" value="1029" />
+            <enumerator name="CullAllFaces" value="1032" />
+            <enumerator name="CullClockwise" value="65536" />
+        </enum>
+        <enum name="SortMode">
+            <enumerator name="DefaultSorting" value="0" />
+            <enumerator name="BackToFront" value="1" />
+        </enum>
+        <property name="position" type="QVector3D" />
+        <property name="x" type="qreal" />
+        <property name="y" type="qreal" />
+        <property name="z" type="qreal" />
+        <property name="scale" type="qreal" />
+        <property name="transform" type="QGraphicsTransform3D" isList="true" />
+        <property name="pretransform" type="QGraphicsTransform3D" isList="true" />
+        <property name="mesh" type="QDeclarativeMesh" />
+        <property name="effect" type="QDeclarativeEffect" />
+        <property name="light" type="QGLLightParameters" />
+        <property name="resources" type="QObject" isList="true" />
+        <property name="data" type="QObject" isList="true" />
+        <property name="children" type="QDeclarativeItem3D" isList="true" />
+        <property name="cullFaces" type="CullFaces" />
+        <property name="sortChildren" type="SortMode" />
+        <property name="meshNode" type="string" />
+        <property name="inheritEvents" type="bool" />
+        <property name="enabled" type="bool" />
+        <property name="parent" type="QDeclarativeItem3D" />
+        <signal name="positionChanged" />
+        <signal name="scaleChanged" />
+        <signal name="rotationChanged" />
+        <signal name="meshChanged" />
+        <signal name="meshNodeChanged" />
+        <signal name="effectChanged" />
+        <signal name="lightChanged" />
+        <signal name="stateChanged">
+            <param type="string" />
+        </signal>
+        <signal name="clicked" />
+        <signal name="doubleClicked" />
+        <signal name="pressed" />
+        <signal name="released" />
+        <signal name="hoverEnter" />
+        <signal name="hoverLeave" />
+        <signal name="inheritEventsChanged" />
+        <signal name="enabledChanged" />
+        <signal name="childrenChanged" />
+        <signal name="parentChanged" />
+        <signal name="sortChildrenChanged" />
+        <method name="update" />
+        <method name="localToWorld" type="QVector3D">
+            <param name="point" type="QVector3D" />
+        </method>
+        <method name="localToWorld" type="QVector3D" />
+        <method name="worldToLocal" type="QVector3D">
+            <param name="point" type="QVector3D" />
+        </method>
+        <method name="worldToLocal" type="QVector3D" />
+    </type>
+    <type name="QDeclarativeMesh" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Mesh" />
+        </exports>
+        <property name="source" type="QUrl" />
+        <property name="meshName" type="string" />
+        <property name="options" type="string" />
+        <property name="dumpInfo" type="bool" />
+        <signal name="dataChanged" />
+        <signal name="loaded" />
+        <signal name="optionsChanged" />
+        <signal name="dumpInfoChanged" />
+        <method name="material" type="QObject*">
+            <param name="nodeName" type="string" />
+            <param name="materialName" type="string" />
+        </method>
+    </type>
+    <type name="QGLCamera" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Camera" />
+        </exports>
+        <enum name="ProjectionType">
+            <enumerator name="Perspective" value="0" />
+            <enumerator name="Orthographic" value="1" />
+        </enum>
+        <enum name="RotateOrder">
+            <enumerator name="TiltPanRoll" value="0" />
+            <enumerator name="TiltRollPan" value="1" />
+            <enumerator name="PanTiltRoll" value="2" />
+            <enumerator name="PanRollTilt" value="3" />
+            <enumerator name="RollTiltPan" value="4" />
+            <enumerator name="RollPanTilt" value="5" />
+        </enum>
+        <property name="projectionType" type="ProjectionType" />
+        <property name="fieldOfView" type="qreal" />
+        <property name="nearPlane" type="qreal" />
+        <property name="farPlane" type="qreal" />
+        <property name="viewSize" type="QSizeF" />
+        <property name="minViewSize" type="QSizeF" />
+        <property name="screenRotation" type="int" />
+        <property name="eye" type="QVector3D" />
+        <property name="upVector" type="QVector3D" />
+        <property name="center" type="QVector3D" />
+        <property name="eyeSeparation" type="qreal" />
+        <property name="motionAdjustment" type="QVector3D" />
+        <property name="adjustForAspectRatio" type="bool" />
+        <signal name="projectionChanged" />
+        <signal name="viewChanged" />
+        <method name="translateEye">
+            <param name="x" type="qreal" />
+            <param name="y" type="qreal" />
+            <param name="z" type="qreal" />
+        </method>
+        <method name="translateCenter">
+            <param name="x" type="qreal" />
+            <param name="y" type="qreal" />
+            <param name="z" type="qreal" />
+        </method>
+        <method name="tiltPanRollCenter">
+            <param name="tiltAngle" type="qreal" />
+            <param name="panAngle" type="qreal" />
+            <param name="rollAngle" type="qreal" />
+            <param name="order" type="QGLCamera.RotateOrder" />
+        </method>
+        <method name="tiltPanRollCenter">
+            <param name="tiltAngle" type="qreal" />
+            <param name="panAngle" type="qreal" />
+            <param name="rollAngle" type="qreal" />
+        </method>
+        <method name="tiltPanRollEye">
+            <param name="tiltAngle" type="qreal" />
+            <param name="panAngle" type="qreal" />
+            <param name="rollAngle" type="qreal" />
+            <param name="order" type="QGLCamera.RotateOrder" />
+        </method>
+        <method name="tiltPanRollEye">
+            <param name="tiltAngle" type="qreal" />
+            <param name="panAngle" type="qreal" />
+            <param name="rollAngle" type="qreal" />
+        </method>
+    </type>
+    <type name="QGLLightModel" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="LightModel" />
+        </exports>
+        <enum name="Model">
+            <enumerator name="OneSided" value="0" />
+            <enumerator name="TwoSided" value="1" />
+        </enum>
+        <enum name="ColorControl">
+            <enumerator name="SingleColor" value="0" />
+            <enumerator name="SeparateSpecularColor" value="1" />
+        </enum>
+        <enum name="ViewerPosition">
+            <enumerator name="ViewerAtInfinity" value="0" />
+            <enumerator name="LocalViewer" value="1" />
+        </enum>
+        <property name="model" type="Model" />
+        <property name="colorControl" type="ColorControl" />
+        <property name="viewerPosition" type="ViewerPosition" />
+        <property name="ambientSceneColor" type="QColor" />
+        <signal name="modelChanged" />
+        <signal name="colorControlChanged" />
+        <signal name="viewerPositionChanged" />
+        <signal name="ambientSceneColorChanged" />
+        <signal name="lightModelChanged" />
+    </type>
+    <type name="QGLLightParameters" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Light" />
+        </exports>
+        <enum name="LightType">
+            <enumerator name="Directional" value="0" />
+            <enumerator name="Positional" value="1" />
+        </enum>
+        <property name="type" type="LightType" />
+        <property name="position" type="QVector3D" />
+        <property name="direction" type="QVector3D" />
+        <property name="ambientColor" type="QColor" />
+        <property name="diffuseColor" type="QColor" />
+        <property name="specularColor" type="QColor" />
+        <property name="spotDirection" type="QVector3D" />
+        <property name="spotExponent" type="qreal" />
+        <property name="spotAngle" type="qreal" />
+        <property name="constantAttenuation" type="qreal" />
+        <property name="linearAttenuation" type="qreal" />
+        <property name="quadraticAttenuation" type="qreal" />
+        <signal name="positionChanged" />
+        <signal name="directionChanged" />
+        <signal name="ambientColorChanged" />
+        <signal name="diffuseColorChanged" />
+        <signal name="specularColorChanged" />
+        <signal name="spotDirectionChanged" />
+        <signal name="spotExponentChanged" />
+        <signal name="spotAngleChanged" />
+        <signal name="constantAttenuationChanged" />
+        <signal name="linearAttenuationChanged" />
+        <signal name="quadraticAttenuationChanged" />
+        <signal name="lightChanged" />
+    </type>
+    <type name="QGLMaterial" extends="QGLAbstractMaterial">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Material" />
+        </exports>
+        <enum name="TextureCombineMode">
+            <enumerator name="Modulate" value="0" />
+            <enumerator name="Decal" value="1" />
+            <enumerator name="Replace" value="2" />
+        </enum>
+        <property name="ambientColor" type="QColor" />
+        <property name="diffuseColor" type="QColor" />
+        <property name="specularColor" type="QColor" />
+        <property name="emittedLight" type="QColor" />
+        <property name="shininess" type="qreal" />
+        <property name="texture" type="QGLTexture2D" />
+        <property name="textureCombineMode" type="QGLMaterial.TextureCombineMode" />
+        <property name="textureUrl" type="QUrl" />
+        <signal name="ambientColorChanged" />
+        <signal name="diffuseColorChanged" />
+        <signal name="specularColorChanged" />
+        <signal name="emittedLightChanged" />
+        <signal name="shininessChanged" />
+        <signal name="texturesChanged" />
+    </type>
+    <type name="QGLSceneNode" extends="QObject">
+        <exports>
+            <export module="Qt3D" version="1.0" type="SceneNode" />
+        </exports>
+        <property name="position" type="QVector3D" />
+        <property name="x" type="qreal" />
+        <property name="y" type="qreal" />
+        <property name="z" type="qreal" />
+        <property name="material" type="QGLMaterial" />
+        <property name="backMaterial" type="QGLMaterial" />
+        <signal name="updated" />
+        <method name="clone" type="QGLSceneNode*">
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="clone" type="QGLSceneNode*" />
+        <method name="cloneNoChildren" type="QGLSceneNode*">
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="cloneNoChildren" type="QGLSceneNode*" />
+        <method name="allExcept" type="QGLSceneNode*">
+            <param name="name" type="string" />
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="allExcept" type="QGLSceneNode*">
+            <param name="name" type="string" />
+        </method>
+        <method name="only" type="QGLSceneNode*">
+            <param name="name" type="string" />
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="only" type="QGLSceneNode*">
+            <param name="name" type="string" />
+        </method>
+        <method name="allExcept" type="QGLSceneNode*">
+            <param name="names" type="QStringList" />
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="allExcept" type="QGLSceneNode*">
+            <param name="names" type="QStringList" />
+        </method>
+        <method name="only" type="QGLSceneNode*">
+            <param name="names" type="QStringList" />
+            <param name="parent" type="QObject" />
+        </method>
+        <method name="only" type="QGLSceneNode*">
+            <param name="names" type="QStringList" />
+        </method>
+    </type>
+    <type name="QGraphicsBillboardTransform" extends="QGraphicsTransform3D">
+        <exports>
+            <export module="Qt3D" version="1.0" type="BillboardTransform" />
+        </exports>
+        <property name="preserveUpVector" type="bool" />
+        <signal name="preserveUpVectorChanged" />
+    </type>
+    <type name="QGraphicsLookAtTransform" extends="QGraphicsTransform3D">
+        <exports>
+            <export module="Qt3D" version="1.0" type="LookAt" />
+        </exports>
+        <property name="preserveUpVector" type="bool" />
+        <property name="subject" type="QDeclarativeItem3D" />
+        <signal name="preserveUpVectorChanged" />
+        <signal name="subjectChanged" />
+    </type>
+    <type name="QGraphicsRotation3D" extends="QGraphicsTransform3D">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Rotation3D" />
+        </exports>
+        <property name="origin" type="QVector3D" />
+        <property name="angle" type="qreal" />
+        <property name="axis" type="QVector3D" />
+        <signal name="originChanged" />
+        <signal name="angleChanged" />
+        <signal name="axisChanged" />
+    </type>
+    <type name="QGraphicsTranslation3D" extends="QGraphicsTransform3D">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Translation3D" />
+        </exports>
+        <property name="translate" type="QVector3D" />
+        <property name="progress" type="qreal" />
+        <signal name="translateChanged" />
+        <signal name="progressChanged" />
+    </type>
+    <type name="Scale3D" extends="QGraphicsScale3D">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Scale3D" />
+        </exports>
+        <property name="scale" type="QVariant" />
+        <signal name="variantScaleChanged" />
+    </type>
+    <type name="ShaderProgram" extends="QDeclarativeEffect">
+        <exports>
+            <export module="Qt3D" version="1.0" type="ShaderProgram" />
+        </exports>
+        <property name="vertexShader" type="string" />
+        <property name="fragmentShader" type="string" />
+        <signal name="finishedLoading" />
+        <signal name="shaderChanged" />
+        <method name="markAllPropertiesDirty" />
+        <method name="markPropertyDirty">
+            <param name="property" type="int" />
+        </method>
+    </type>
+    <type name="Viewport" defaultProperty="data" extends="QDeclarativeItem">
+        <exports>
+            <export module="Qt3D" version="1.0" type="Viewport" />
+        </exports>
+        <property name="picking" type="bool" />
+        <property name="showPicking" type="bool" />
+        <property name="navigation" type="bool" />
+        <property name="blending" type="bool" />
+        <property name="camera" type="QGLCamera" />
+        <property name="light" type="QGLLightParameters" />
+        <property name="lightModel" type="QGLLightModel" />
+        <signal name="viewportChanged" />
+        <method name="update3d" />
+        <method name="objectForPoint" type="QObject*">
+            <param name="x" type="qreal" />
+            <param name="y" type="qreal" />
+        </method>
+    </type>
+<\module>
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index de6290df8..7a80979b3 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -44,8 +44,10 @@ scenegraph {
         viewportfbonode_sg.h
 }
 
+# See the file README.library_xml for more on this
 qdeclarativesources.files += \
-    qmldir
+    qmldir \
+    library.xml
 
 qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D
 
diff --git a/src/scripts/README b/src/scripts/README
new file mode 100644
index 000000000..bf1f05d2a
--- /dev/null
+++ b/src/scripts/README
@@ -0,0 +1,35 @@
+This directory contains miscellaneous utility scripts for use with Qt3D.
+
+filter-qmldump.pl
+=================
+
+Use this script to regenerate the library.xml files after making changes
+to the properties or structure of the QML bindings.
+
+It expects a file called "library.xml" to be in the current directory, and
+requires a single command line argument, which is a string matching the 
+module name to filter on.
+
+Typical use:
+
+1) Build and install Qt3D into a given Qt at $QTDIR
+2) Ensure $QTDIR/qtc-qmldump exists (see below)
+3) Run qmldump to generate the library.xml file:
+   $QTDIR/qtc-qmldump/qmldump $QTDIR/imports Qt3D > library.xml
+4) Filter the output to just include the Qt3D module:
+   filter-qmldump.pl Qt3D > library-qt3d.xml
+
+Repeat 3) & 4) for the Shapes library:
+   $QTDIR/qtc-qmldump/qmldump.app/Contents/MacOS/qmldump $QTDIR/imports/Shapes Qt3D.Shapes > library.xml
+   filter-qmldump.pl Qt3D > library-qt3d.xml
+
+Note: the "qmldump" utility is specific to the Qt version, since it has to
+load the actual QML plugin to generate the XML description of the items.
+In binary packages of Qt there should already be a qmldump utility shipped
+with the package.  In other cases Qt Creator will build qmldump on the fly
+and install it into the relevant Qt build.  However there are several fail
+modes: http://labs.qt.nokia.com/2010/11/30/new-qml-editor-features/
+
+If it doesn't exist, the only way to be sure is to build Qt from source
+with the -nokia-developer option, and then run Qt Creator to create a
+QML project which uses that version of Qt.
diff --git a/src/scripts/filter-qmldump.pl b/src/scripts/filter-qmldump.pl
new file mode 100755
index 000000000..1c867ec7f
--- /dev/null
+++ b/src/scripts/filter-qmldump.pl
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+############################################################################
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (qt-info@nokia.com)
+##
+## This file is part of the QtQuick3D module of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## No Commercial Usage
+## This file contains pre-release code and may not be distributed.
+## You may use this file in accordance with the terms and conditions
+## contained in the Technology Preview License Agreement accompanying
+## this package.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at qt-info@nokia.com.
+##
+##
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+use strict;
+use warnings;
+
+use XML::XPath;
+use XML::XPath::XMLParser;
+
+my $mod = shift or die "Usage: filter-qmldump.pl <module name>\n";
+
+warn "Filtering for modules in $mod\n";
+
+my $xp = XML::XPath->new(filename => 'library.xml');
+
+my $nodeset = $xp->find("//type/exports/export[\@module=\'$mod\']/../..");
+
+print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+print "<module>\n";
+
+foreach my $node ($nodeset->get_nodelist)
+{
+    print "    " . XML::XPath::XMLParser::as_string($node) . "\n";
+}
+
+print "<\\module>\n";
diff --git a/src/threed/painting/qglpainter.cpp b/src/threed/painting/qglpainter.cpp
index b3f6a2c59..04c58bb88 100644
--- a/src/threed/painting/qglpainter.cpp
+++ b/src/threed/painting/qglpainter.cpp
@@ -559,6 +559,7 @@ const QGLContext *QGLPainter::context() const
 */
 bool QGLPainter::isFixedFunction() const
 {
+    return false;
 #if defined(QT_OPENGL_ES_2)
     return false;
 #else