Merge branch '5.5.0' into 5.5

Conflicts: src/input/qkeyboardcontroller.cpp Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
author: Sean Harmer <sean.harmer@kdab.com> 2015-06-21 14:57:33 +0100
committer: Sean Harmer <sean.harmer@kdab.com> 2015-06-21 14:57:33 +0100
commit: 099f466847039954c581030c2a5aa2bfce08e0eb (patch)
tree: 194a94d15a68b0c38d2d45c12275afb2c91b9831 /examples
parent: 7bbd402770fa27f944840c95b6a3c6121883bc58 (diff)
parent: b71f09d143002f15abfd4a407651544942a75c44 (diff)
121 files changed, 733 insertions, 201 deletions
diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml
index c91d81ddf..3098ba367 100644
--- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml
+++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
index 46164fc60..b958255ee 100644
--- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
+++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Viewport {
 
diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp
index 4521970f0..6072269ae 100644
--- a/examples/qt3d/anaglyph-rendering/main.cpp
+++ b/examples/qt3d/anaglyph-rendering/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml
index bf1dd211c..aaa253f3c 100644
--- a/examples/qt3d/anaglyph-rendering/main.qml
+++ b/examples/qt3d/anaglyph-rendering/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.4 as QQ2
 
 Entity {
diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp
index 2925626cd..d068f443e 100644
--- a/examples/qt3d/assimp-cpp/main.cpp
+++ b/examples/qt3d/assimp-cpp/main.cpp
@@ -37,7 +37,7 @@
 #include <QFileDialog>
 #include <QApplication>
 
-#include <Qt3DCore/Window>
+#include <window.h>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QAspectEngine>
@@ -52,7 +52,7 @@ int main(int ac, char **av)
 {
     QApplication app(ac, av);
 
-    Qt3D::Window view;
+    Window view;
 
     Qt3D::QAspectEngine engine;
     Qt3D::QInputAspect *inputAspect = new Qt3D::QInputAspect();
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp
index d9c0ede88..d8fcbc269 100644
--- a/examples/qt3d/assimp/main.cpp
+++ b/examples/qt3d/assimp/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml
index f93c20171..ae6431476 100644
--- a/examples/qt3d/assimp/main.qml
+++ b/examples/qt3d/assimp/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity
 {
diff --git a/examples/qt3d/torus-cpp/torus-cpp.pro b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro
index eeefc5c22..546715fca 100644
--- a/examples/qt3d/torus-cpp/torus-cpp.pro
+++ b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro
@@ -3,7 +3,12 @@
 }
 
 QT += 3dcore 3drenderer 3dinput
+QT += widgets
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+    scenemodifier.cpp
+
+HEADERS += \
+    scenemodifier.h
 
 
diff --git a/examples/qt3d/basicshapes-cpp/doc/images/basicshapes-cpp-example.jpg b/examples/qt3d/basicshapes-cpp/doc/images/basicshapes-cpp-example.jpg
new file mode 100644
index 000000000..cdf694427
--- /dev/null
+++ b/examples/qt3d/basicshapes-cpp/doc/images/basicshapes-cpp-example.jpg
diff --git a/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc b/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc
new file mode 100644
index 000000000..004b06817
--- /dev/null
+++ b/examples/qt3d/basicshapes-cpp/doc/src/basicshapes.qdoc
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example basicshapes-cpp
+    \title Qt3D: Basic Shapes C++ Example
+    \ingroup qt3d-examples-cpp
+    \brief Shows four basic shapes that Qt3D offers.
+
+    The Basic Shapes examples shows four basic shapes that Qt3D offers, a torus,
+    a cylinder, a cube and a sphere. The example also shows how to embed a Qt3D scene
+    into a widget and connect with other widgets.
+
+    \image basicshapes-cpp-example.jpg
+
+    As an example let's go through how to set up a torus mesh. First instantiate
+    the \c QTorusMesh, and then set the mesh specific parameters, that for torus are
+    radius, minor radius and how many rings and slices.
+
+    \snippet basicshapes-cpp/scenemodifier.cpp 0
+
+    The size and position of the torus can be adjusted with transform components.
+    We create scale, translation and rotation components and add them into the
+    \c QTransform component.
+
+    \snippet basicshapes-cpp/scenemodifier.cpp 1
+
+    To change the diffuse color of the mesh we create a \c QPhongMaterial and set
+    its diffuse color.
+
+    \snippet basicshapes-cpp/scenemodifier.cpp 2
+
+    The final step is to add the torus into an entity tree, and we do that by creating
+    a \c QEntity with parent entity and adding the previously created mesh, material
+    and transform components into it.
+
+    \snippet basicshapes-cpp/scenemodifier.cpp 3
+
+    You can control the visibility of the entity by defining if it has parent
+    or not, i.e. whether it is part of entity tree or not.
+
+    \snippet basicshapes-cpp/scenemodifier.cpp 4
+
+
+*/
diff --git a/examples/qt3d/torus-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index b2cf5b24b..1e122c65e 100644
--- a/examples/qt3d/torus-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -34,13 +34,22 @@
 **
 ****************************************************************************/
 
+#include "scenemodifier.h"
+
 #include <QGuiApplication>
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
 
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QCommandLinkButton>
+#include <QtGui/QScreen>
+
 #include <Qt3DInput/QInputAspect>
 
 #include <Qt3DRenderer/qtorusmesh.h>
@@ -64,17 +73,30 @@
 
 int main(int argc, char **argv)
 {
-    QGuiApplication app(argc, argv);
+    QApplication app(argc, argv);
+    Window *view = new Window();
+    QWidget *container = QWidget::createWindowContainer(view);
+    QSize screenSize = view->screen()->size();
+    container->setMinimumSize(QSize(200, 100));
+    container->setMaximumSize(screenSize);
+
+    QWidget *widget = new QWidget;
+    QHBoxLayout *hLayout = new QHBoxLayout(widget);
+    QVBoxLayout *vLayout = new QVBoxLayout();
+    vLayout->setAlignment(Qt::AlignTop);
+    hLayout->addWidget(container, 1);
+    hLayout->addLayout(vLayout);
+
+    widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
-    Qt3D::Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
     QVariantMap data;
-    data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
-    data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view));
+    data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(view)));
+    data.insert(QStringLiteral("eventSource"), QVariant::fromValue(view));
     engine.setData(data);
 
     // Root entity
@@ -95,40 +117,68 @@ int main(int argc, char **argv)
     Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
 
     forwardRenderer->setCamera(cameraEntity);
-    forwardRenderer->setClearColor(Qt::black);
+    forwardRenderer->setClearColor(QColor(QRgb(0x4d4d4f)));
     frameGraph->setActiveFrameGraph(forwardRenderer);
 
-    // Torus shape data
-    Qt3D::QTorusMesh *torus = new Qt3D::QTorusMesh();
-    torus->setRadius(5);
-    torus->setMinorRadius(1);
-    torus->setRings(100);
-    torus->setSlices(20);
-
-    // TorusMesh Transform
-    Qt3D::QScaleTransform *torusScale = new Qt3D::QScaleTransform();
-    Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
-
-    torusScale->setScale3D(QVector3D(1.5f, 1.0f, 0.5f));
-    torusRotation->setAngleDeg(45.0f);
-    torusRotation->setAxis(QVector3D(1, 0, 0));
-
-    torusTransforms->addTransform(torusScale);
-    torusTransforms->addTransform(torusRotation);
-
-    // Torus
-    Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity);
-    torusEntity->addComponent(torus);
-    torusEntity->addComponent(torusTransforms);
-
     // Setting the FrameGraph
     rootEntity->addComponent(frameGraph);
 
+    // Scenemodifier
+    SceneModifier *modifier = new SceneModifier(rootEntity);
+
     // Set root object of the scene
     engine.setRootEntity(rootEntity);
+
+    // Create control widgets
+    QCommandLinkButton *info = new QCommandLinkButton();
+    info->setText(QStringLiteral("Qt3D ready-made meshes"));
+    info->setDescription(QStringLiteral("Qt3D provides several ready-made meshes, like torus, cylinder, cube and sphere."));
+    info->setIconSize(QSize(0,0));
+
+    QCheckBox *torusCB = new QCheckBox(widget);
+    torusCB->setChecked(true);
+    torusCB->setText(QStringLiteral("Torus"));
+
+    QCheckBox *cylinderCB = new QCheckBox(widget);
+    cylinderCB->setChecked(true);
+    cylinderCB->setText(QStringLiteral("Cylinder"));
+
+    QCheckBox *cuboidCB = new QCheckBox(widget);
+    cuboidCB->setChecked(true);
+    cuboidCB->setText(QStringLiteral("Cuboid"));
+
+    QCheckBox *sphereCB = new QCheckBox(widget);
+    sphereCB->setChecked(true);
+    sphereCB->setText(QStringLiteral("Sphere"));
+
+    vLayout->addWidget(info);
+    vLayout->addWidget(torusCB);
+    vLayout->addWidget(cylinderCB);
+    vLayout->addWidget(cuboidCB);
+    vLayout->addWidget(sphereCB);
+
+    QObject::connect(torusCB, &QCheckBox::stateChanged,
+                     modifier, &SceneModifier::enableTorus);
+    QObject::connect(cylinderCB, &QCheckBox::stateChanged,
+                     modifier, &SceneModifier::enableCylinder);
+    QObject::connect(cuboidCB, &QCheckBox::stateChanged,
+                     modifier, &SceneModifier::enableCuboid);
+    QObject::connect(sphereCB, &QCheckBox::stateChanged,
+                     modifier, &SceneModifier::enableSphere);
+
+    torusCB->setChecked(true);
+    cylinderCB->setChecked(true);
+    cuboidCB->setChecked(true);
+    sphereCB->setChecked(true);
+
     // Show window
-    view.show();
+    widget->show();
+    widget->resize(1200, 800);
+
+    // Update the aspect ratio
+    QSize widgetSize =  container->size();
+    float aspectRatio = float(widgetSize.width()) / float(widgetSize.height());
+    cameraEntity->lens()->setPerspectiveProjection(45.0f, aspectRatio, 0.1f, 1000.0f);
 
     return app.exec();
 }
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
new file mode 100644
index 000000000..b5c636b0f
--- /dev/null
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "scenemodifier.h"
+
+#include <QtCore/QDebug>
+
+SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
+    : m_rootEntity(rootEntity)
+{
+
+    // Torus shape data
+    //! [0]
+    m_torus = new Qt3D::QTorusMesh();
+    m_torus->setRadius(1.0f);
+    m_torus->setMinorRadius(0.4f);
+    m_torus->setRings(100);
+    m_torus->setSlices(20);
+    //! [0]
+
+    // TorusMesh Transform
+    //! [1]
+    Qt3D::QScaleTransform *torusScale = new Qt3D::QScaleTransform();
+    Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform();
+    Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform();
+    Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
+
+    torusScale->setScale3D(QVector3D(2.0f, 2.0f, 2.0f));
+    torusTranslation->setTranslation(QVector3D(1.7f, 1.7f, 0.0f));
+    torusRotation->setAngleDeg(25.0f);
+    torusRotation->setAxis(QVector3D(0, 1, 0));
+
+    torusTransforms->addTransform(torusRotation);
+    torusTransforms->addTransform(torusTranslation);
+    torusTransforms->addTransform(torusScale);
+    //! [1]
+
+    //! [2]
+    Qt3D::QPhongMaterial *torusMaterial = new Qt3D::QPhongMaterial();
+    torusMaterial->setDiffuse(QColor(QRgb(0xbeb32b)));
+    //! [2]
+
+    // Torus
+    //! [3]
+    m_torusEntity = new Qt3D::QEntity(m_rootEntity);
+    m_torusEntity->addComponent(m_torus);
+    m_torusEntity->addComponent(torusMaterial);
+    m_torusEntity->addComponent(torusTransforms);
+    //! [3]
+
+    // Cylinder shape data
+    Qt3D::QCylinderMesh *cylinder = new Qt3D::QCylinderMesh();
+    cylinder->setRadius(1);
+    cylinder->setLength(3);
+    cylinder->setRings(100);
+    cylinder->setSlices(20);
+
+    // CylinderMesh Transform
+    Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform();
+    Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform();
+    Qt3D::QTranslateTransform *cylinderTranslation = new Qt3D::QTranslateTransform();
+    Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform();
+
+    cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f));
+    cylinderTranslation->setTranslation(QVector3D(-2.6f, 2.4f, -1.5));
+    cylinderRotation->setAngleDeg(45.0f);
+    cylinderRotation->setAxis(QVector3D(1, 0, 0));
+
+    cylinderTransforms->addTransform(cylinderTranslation);
+    cylinderTransforms->addTransform(cylinderRotation);
+    cylinderTransforms->addTransform(cylinderScale);
+
+    Qt3D::QPhongMaterial *cylinderMaterial = new Qt3D::QPhongMaterial();
+    cylinderMaterial->setDiffuse(QColor(QRgb(0x928327)));
+
+    // Cylinder
+    m_cylinderEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cylinderEntity->addComponent(cylinder);
+    m_cylinderEntity->addComponent(cylinderMaterial);
+    m_cylinderEntity->addComponent(cylinderTransforms);
+
+    // Cuboid shape data
+    Qt3D::QCuboidMesh *cuboid = new Qt3D::QCuboidMesh();
+
+    // CuboidMesh Transform
+    Qt3D::QScaleTransform *cuboidScale = new Qt3D::QScaleTransform();
+    Qt3D::QTranslateTransform *cuboidTranslation = new Qt3D::QTranslateTransform();
+    Qt3D::QTransform *cuboidTransforms = new Qt3D::QTransform();
+
+    cuboidScale->setScale3D(QVector3D(4.0f, 4.0f, 4.0f));
+    cuboidTranslation->setTranslation(QVector3D(0.9f, -0.9f, 0.0f));
+
+    cuboidTransforms->addTransform(cuboidTranslation);
+    cuboidTransforms->addTransform(cuboidScale);
+
+    Qt3D::QPhongMaterial *cuboidMaterial = new Qt3D::QPhongMaterial();
+    cuboidMaterial->setDiffuse(QColor(QRgb(0x665423)));
+
+    //Cuboid
+    m_cuboidEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cuboidEntity->addComponent(cuboid);
+    m_cuboidEntity->addComponent(cuboidMaterial);
+    m_cuboidEntity->addComponent(cuboidTransforms);
+
+    // Sphere shape data
+    Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh();
+    sphereMesh->setRings(20);
+    sphereMesh->setSlices(20);
+    sphereMesh->setRadius(2);
+
+    // Sphere mesh transform
+    Qt3D::QScaleTransform *sphereScale = new Qt3D::QScaleTransform();
+    Qt3D::QTranslateTransform *sphereTranslation = new Qt3D::QTranslateTransform();
+    Qt3D::QTransform *sphereTransforms = new Qt3D::QTransform();
+
+    sphereScale->setScale3D(QVector3D(1.3f, 1.3f, 1.3f));
+    sphereTranslation->setTranslation(QVector3D(-2.9f, -2.9f, 0.0f));
+
+    sphereTransforms->addTransform(sphereTranslation);
+    sphereTransforms->addTransform(sphereScale);
+
+    Qt3D::QPhongMaterial *sphereMaterial = new Qt3D::QPhongMaterial();
+    sphereMaterial->setDiffuse(QColor(QRgb(0xa69929)));
+
+    // Sphere
+    m_sphereEntity = new Qt3D::QEntity(m_rootEntity);
+    m_sphereEntity->addComponent(sphereMesh);
+    m_sphereEntity->addComponent(sphereMaterial);
+    m_sphereEntity->addComponent(sphereTransforms);
+}
+
+SceneModifier::~SceneModifier()
+{
+}
+
+//! [4]
+void SceneModifier::enableTorus(bool enabled)
+{
+    m_torusEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR);
+}
+//! [4]
+
+void SceneModifier::enableCylinder(bool enabled)
+{
+    m_cylinderEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR);
+}
+
+void SceneModifier::enableCuboid(bool enabled)
+{
+    m_cuboidEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR);
+}
+
+void SceneModifier::enableSphere(bool enabled)
+{
+    m_sphereEntity->setParent(enabled ? m_rootEntity : Q_NULLPTR);
+}
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h
new file mode 100644
index 000000000..ba4718401
--- /dev/null
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SCENEMODIFIER_H
+#define SCENEMODIFIER_H
+
+#include <QtCore/QObject>
+
+#include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qscaletransform.h>
+#include <Qt3DCore/qrotatetransform.h>
+#include <Qt3DCore/qtransform.h>
+#include <Qt3DCore/QTranslateTransform>
+
+#include <Qt3DRenderer/QTorusMesh>
+#include <Qt3DRenderer/QCylinderMesh>
+#include <Qt3DRenderer/QCuboidMesh>
+#include <Qt3DRenderer/QSphereMesh>
+#include <Qt3DRenderer/QPhongMaterial>
+
+class SceneModifier : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit SceneModifier(Qt3D::QEntity *rootEntity);
+    ~SceneModifier();
+
+public slots:
+    void enableTorus(bool enabled);
+    void enableCylinder(bool enabled);
+    void enableCuboid(bool enabled);
+    void enableSphere(bool enabled);
+
+private:
+    Qt3D::QEntity *m_rootEntity;
+    Qt3D::QTorusMesh *m_torus;
+    Qt3D::QEntity *m_cylinderEntity;
+    Qt3D::QEntity *m_torusEntity;
+    Qt3D::QEntity *m_cuboidEntity;
+    Qt3D::QEntity *m_sphereEntity;
+};
+
+#endif // SCENEMODIFIER_H
+
diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml
index fd30c1071..8e0e819bc 100644
--- a/examples/qt3d/bigmodel-qml/MyEntity.qml
+++ b/examples/qt3d/bigmodel-qml/MyEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp
index 6e76f1f5a..5d57b0694 100644
--- a/examples/qt3d/bigmodel-qml/main.cpp
+++ b/examples/qt3d/bigmodel-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/QRenderAspect>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -47,7 +47,7 @@
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml
index 2831d3c02..2d5cdf536 100644
--- a/examples/qt3d/bigmodel-qml/main.qml
+++ b/examples/qt3d/bigmodel-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 Entity {
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 5ab25bf5e..ec99f9bc9 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -35,10 +35,11 @@
 ****************************************************************************/
 
 #include <QGuiApplication>
+#include <window.h>
+
 #include <QPropertyAnimation>
 #include <QUrl>
 #include <QTimer>
-#include <Qt3DCore/Window>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QTransform>
diff --git a/examples/qt3d/common/window.cpp b/examples/qt3d/common/window.cpp
new file mode 100644
index 000000000..433942f25
--- /dev/null
+++ b/examples/qt3d/common/window.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "window.h"
+
+#include <QKeyEvent>
+#include <QGuiApplication>
+#include <QOpenGLContext>
+
+Window::Window(QScreen *screen)
+    : QWindow(screen)
+
+{
+    setSurfaceType(QSurface::OpenGLSurface);
+
+    resize(1024, 768);
+
+    QSurfaceFormat format;
+    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
+        format.setVersion(4, 3);
+        format.setProfile(QSurfaceFormat::CoreProfile);
+    }
+    format.setDepthBufferSize( 24 );
+    format.setSamples( 4 );
+    setFormat(format);
+    create();
+}
+
+Window::~Window()
+{
+}
+
+void Window::keyPressEvent( QKeyEvent* e )
+{
+    switch ( e->key() )
+    {
+        case Qt::Key_Escape:
+            QGuiApplication::quit();
+            break;
+
+        default:
+            QWindow::keyPressEvent( e );
+    }
+}
diff --git a/examples/qt3d/common/window.h b/examples/qt3d/common/window.h
new file mode 100644
index 000000000..7c6e3606e
--- /dev/null
+++ b/examples/qt3d/common/window.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include <QWindow>
+
+class Window : public QWindow
+{
+    Q_OBJECT
+public:
+    explicit Window(QScreen *screen = 0);
+    ~Window();
+
+protected:
+    virtual void keyPressEvent(QKeyEvent *e);
+};
+
+#endif // QT3D_WINDOW_H
diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml
index 7d85ee941..bcd7a4359 100644
--- a/examples/qt3d/controls/Logo.qml
+++ b/examples/qt3d/controls/Logo.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.0
 
 Entity {
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 014e8d958..2bc079e25 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -36,7 +36,7 @@
 
 #include <QGuiApplication>
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -71,7 +71,7 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index 13a40ddfb..01e6c7cf7 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -36,7 +36,7 @@
 
 #include <QGuiApplication>
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp
index 171c11f92..53a1a94b9 100644
--- a/examples/qt3d/cylinder-qml/main.cpp
+++ b/examples/qt3d/cylinder-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml
index 282826116..4c5e5e4e7 100644
--- a/examples/qt3d/cylinder-qml/main.qml
+++ b/examples/qt3d/cylinder-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: sceneRoot
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 24814585f..7e6c03d58 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include <Qt3DCore/QEntity>
-#include <Qt3DCore/Window>
+#include <window.h>
 
 #include <Qt3DInput/QInputAspect>
 
@@ -67,7 +67,7 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
index d95402cb9..82401fe66 100644
--- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Viewport {
     rect : Qt.rect(0.0, 0.0, 1.0, 1.0)
diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
index f46e65c12..07dbdffa5 100644
--- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     techniques : [
diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
index 309cec160..94c889be1 100644
--- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml
+++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 RenderTarget {
 
diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
index e4cfdf8c5..589a4ac37 100644
--- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id : sceneMaterialEffect
diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp
index 533bea16b..efbe03d70 100644
--- a/examples/qt3d/deferred-renderer-qml/main.cpp
+++ b/examples/qt3d/deferred-renderer-qml/main.cpp
@@ -35,7 +35,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml
index d70619baa..4b9ee9a28 100644
--- a/examples/qt3d/deferred-renderer-qml/main.qml
+++ b/examples/qt3d/deferred-renderer-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.0 as QQ2
 
 Entity {
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 8d265ec33..4d43ba59b 100644
--- a/examples/qt3d/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
@@ -36,9 +36,9 @@
 
 #include <QGuiApplication>
 
+#include <window.h>
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DCore/QCamera>
-#include <Qt3DCore/Window>
 
 #include <Qt3DInput/QInputAspect>
 
@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp
index 0b3f1023c..6152557a5 100644
--- a/examples/qt3d/enabled-qml/main.cpp
+++ b/examples/qt3d/enabled-qml/main.cpp
@@ -36,8 +36,8 @@
 
 #include <QGuiApplication>
 
+#include <window.h>
 #include <Qt3DCore/QCamera>
-#include <Qt3DCore/Window>
 #include <Qt3DQuick/QQmlAspectEngine>
 
 #include <Qt3DRenderer/QRenderAspect>
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
     engine.aspectEngine()->initialize();
diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml
index 031759556..a7cb5ed45 100644
--- a/examples/qt3d/enabled-qml/main.qml
+++ b/examples/qt3d/enabled-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.0 as QQ2
 
 Entity {
diff --git a/examples/qt3d/exampleresources/assets/LICENSE b/examples/qt3d/exampleresources/assets/LICENSE
new file mode 100644
index 000000000..8d2cfc6c9
--- /dev/null
+++ b/examples/qt3d/exampleresources/assets/LICENSE
@@ -0,0 +1,5 @@
+cubemaps:     See cubemaps/miramar/README.TXT
+
+gltf:         See gltf/LICENSE.md
+
+textures:     See textures/pattern_09/readme.txt
diff --git a/examples/qt3d/exampleresources/assets/gltf/LICENSE.md b/examples/qt3d/exampleresources/assets/gltf/LICENSE.md
new file mode 100644
index 000000000..25e13f1d6
--- /dev/null
+++ b/examples/qt3d/exampleresources/assets/gltf/LICENSE.md
@@ -0,0 +1,33 @@
+This license is for the example glTF code, not the [specification](specification/README.md) and [schema](specification).
+
+Original work Copyright (c) 2012, Motorola Mobility, Inc.
+All Rights Reserved.
+BSD License.
+
+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 Motorola Mobility 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.
+
+Additional contributions copyright their respective contributors (also BSD License):
+   * Fabrice Robinet
+   * Analytical Graphics, Inc.
diff --git a/examples/qt3d/examples.pri b/examples/qt3d/examples.pri
index 6e2f67dcc..5f67884c0 100644
--- a/examples/qt3d/examples.pri
+++ b/examples/qt3d/examples.pri
@@ -1,4 +1,8 @@
 TEMPLATE = app
 
+INCLUDEPATH += $$PWD/common
+SOURCES += $$PWD/common/window.cpp
+HEADERS += $$PWD/common/window.h
+
 target.path = $$[QT_INSTALL_EXAMPLES]/qt3d/$$TARGET
 INSTALLS += target
diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp
index 523ee4396..1c1018404 100644
--- a/examples/qt3d/gltf/main.cpp
+++ b/examples/qt3d/gltf/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml
index 3fd8ca398..acce5d7ac 100644
--- a/examples/qt3d/gltf/main.qml
+++ b/examples/qt3d/gltf/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp
index 0238633d3..0797d355f 100644
--- a/examples/qt3d/keyboardinput-qml/main.cpp
+++ b/examples/qt3d/keyboardinput-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml
index ef5afd077..100773280 100644
--- a/examples/qt3d/keyboardinput-qml/main.qml
+++ b/examples/qt3d/keyboardinput-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import Qt3D.Input 2.0
 
 Entity {
diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml
index d05e47a57..9de96e1a3 100644
--- a/examples/qt3d/loader-qml/CuboidEntity.qml
+++ b/examples/qt3d/loader-qml/CuboidEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     components: [ mesh, material, transform ]
diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml
index fe36c1467..2825b8253 100644
--- a/examples/qt3d/loader-qml/SphereEntity.qml
+++ b/examples/qt3d/loader-qml/SphereEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     components: [ mesh, material ]
diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp
index e74dc8b43..45385a76c 100644
--- a/examples/qt3d/loader-qml/main.cpp
+++ b/examples/qt3d/loader-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml
index fa3e8ff5a..76eb524ec 100644
--- a/examples/qt3d/loader-qml/main.qml
+++ b/examples/qt3d/loader-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 Entity {
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index 2e5a4834b..057f4f35e 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -36,8 +36,8 @@
 
 #include <QGuiApplication>
 
+#include <window.h>
 #include <Qt3DCore/QEntity>
-#include <Qt3DCore/Window>
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DCore/QCamera>
 
@@ -59,7 +59,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
     Qt3D::QInputAspect *input = new Qt3D::QInputAspect;
diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml
index 1dcec0ca1..a79cffbc1 100644
--- a/examples/qt3d/materials/Barrel.qml
+++ b/examples/qt3d/materials/Barrel.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml
index f96132416..e8a8bd7f4 100644
--- a/examples/qt3d/materials/BasicCamera.qml
+++ b/examples/qt3d/materials/BasicCamera.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Camera {
     id: mainCamera
diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml
index 1acd126ff..a8ef6b3f5 100644
--- a/examples/qt3d/materials/Chest.qml
+++ b/examples/qt3d/materials/Chest.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml
index 353a252d2..1f2a759af 100644
--- a/examples/qt3d/materials/HousePlant.qml
+++ b/examples/qt3d/materials/HousePlant.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml
index 222b5a33b..6e1f1925e 100644
--- a/examples/qt3d/materials/PlaneEntity.qml
+++ b/examples/qt3d/materials/PlaneEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml
index 03119b713..60b62a05b 100644
--- a/examples/qt3d/materials/RenderableEntity.qml
+++ b/examples/qt3d/materials/RenderableEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml
index 0687785fb..13e79800f 100644
--- a/examples/qt3d/materials/SortedForwardRenderer.qml
+++ b/examples/qt3d/materials/SortedForwardRenderer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 TechniqueFilter {
     id: root
diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml
index 48b334ce0..51b2409b3 100644
--- a/examples/qt3d/materials/TrefoilKnot.qml
+++ b/examples/qt3d/materials/TrefoilKnot.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp
index e27bbdaff..160831d3e 100644
--- a/examples/qt3d/materials/main.cpp
+++ b/examples/qt3d/materials/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml
index cceac110b..2a3190640 100644
--- a/examples/qt3d/materials/main.qml
+++ b/examples/qt3d/materials/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp
index 666aa1434..bb64bf2c7 100644
--- a/examples/qt3d/multiviewport/main.cpp
+++ b/examples/qt3d/multiviewport/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -44,7 +44,7 @@
 int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect);
diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml
index c5ad221dd..c5606fd25 100644
--- a/examples/qt3d/multiviewport/main.qml
+++ b/examples/qt3d/multiviewport/main.qml
@@ -36,7 +36,7 @@
 
 import QtQuick 2.0
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 
 Entity {
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index 3088f996a..f3c88f058 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/planets-qml/Light.qml b/examples/qt3d/planets-qml/Light.qml
index ab63bf1e0..199d3f30a 100644
--- a/examples/qt3d/planets-qml/Light.qml
+++ b/examples/qt3d/planets-qml/Light.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/planets-qml/Planet.qml b/examples/qt3d/planets-qml/Planet.qml
index 005312b5d..4381ebdb1 100644
--- a/examples/qt3d/planets-qml/Planet.qml
+++ b/examples/qt3d/planets-qml/Planet.qml
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 SphereMesh {
     property real r: 0
diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml
index 5d3f64f89..34dab4498 100644
--- a/examples/qt3d/planets-qml/PlanetEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectD.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml
index a36cdf427..dc261582d 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/planets-qml/PlanetEffectDS.qml b/examples/qt3d/planets-qml/PlanetEffectDS.qml
index 670fccc15..f1b2a2e2d 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDS.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDS.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
index 1b035406a..58a1d1d80 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/planets-qml/PlanetMaterial.qml b/examples/qt3d/planets-qml/PlanetMaterial.qml
index 5fd259e45..25f7da09d 100644
--- a/examples/qt3d/planets-qml/PlanetMaterial.qml
+++ b/examples/qt3d/planets-qml/PlanetMaterial.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1
 
 Material {
diff --git a/examples/qt3d/planets-qml/Ring.qml b/examples/qt3d/planets-qml/Ring.qml
index 7bf585805..1dcb59618 100644
--- a/examples/qt3d/planets-qml/Ring.qml
+++ b/examples/qt3d/planets-qml/Ring.qml
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 // TODO: Once support for meshes from arrays is implemented, replace ring.obj with that
 Mesh {
diff --git a/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml b/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml
index 8b52e42d4..5020d13c0 100644
--- a/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 FrameGraph {
diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml
index d34627735..328f41c1b 100644
--- a/examples/qt3d/planets-qml/SolarSystem.qml
+++ b/examples/qt3d/planets-qml/SolarSystem.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.0 as QQ2
 
 import "planets.js" as Planets
diff --git a/examples/qt3d/playground-qml/AdsEffect.qml b/examples/qt3d/playground-qml/AdsEffect.qml
index 4bc81ca44..958d69768 100644
--- a/examples/qt3d/playground-qml/AdsEffect.qml
+++ b/examples/qt3d/playground-qml/AdsEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 // For Qt.vector3d() and friends. For some reason this is provided by
 // QQuickValueTypeProvider in QtQuick rather than the default value
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 50605baee..f376baf31 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 Material {
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 9bc3cad58..8d7395786 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Technique {
     annotations : [
diff --git a/examples/qt3d/playground-qml/DetailView.qml b/examples/qt3d/playground-qml/DetailView.qml
index 92a2f3a1f..f0fc20d38 100644
--- a/examples/qt3d/playground-qml/DetailView.qml
+++ b/examples/qt3d/playground-qml/DetailView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 
 Entity {
diff --git a/examples/qt3d/playground-qml/MainView.qml b/examples/qt3d/playground-qml/MainView.qml
index 0f115d397..8e477f698 100644
--- a/examples/qt3d/playground-qml/MainView.qml
+++ b/examples/qt3d/playground-qml/MainView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.0 as QQ2
 
 Entity {
diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index b4b412e77..0c9d08c62 100644
--- a/examples/qt3d/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 TechniqueFilter {
     id: root
diff --git a/examples/qt3d/playground-qml/RenderableEntity.qml b/examples/qt3d/playground-qml/RenderableEntity.qml
index 13be8f1f9..bdb1f22b9 100644
--- a/examples/qt3d/playground-qml/RenderableEntity.qml
+++ b/examples/qt3d/playground-qml/RenderableEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     property Transform transform;
diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp
index 6ec4c6097..9b2ff6e0b 100644
--- a/examples/qt3d/playground-qml/main.cpp
+++ b/examples/qt3d/playground-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml
index a5605f762..09a784955 100644
--- a/examples/qt3d/playground-qml/main.qml
+++ b/examples/qt3d/playground-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import Qt3D.Input 2.0
 import QtQuick 2.2 as QQ2
 
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
index a7883f706..583d6b081 100644
--- a/examples/qt3d/qt3d.pro
+++ b/examples/qt3d/qt3d.pro
@@ -9,7 +9,6 @@ SUBDIRS += \
     cpp_example \
     multiviewport \
     torus-qml \
-    torus-cpp \
     cylinder-qml \
     cylinder-cpp \
     bigmodel-qml \
@@ -35,4 +34,5 @@ SUBDIRS += \
 
 # TODO Port the old examples to new APIs
 #SUBDIRS += qt3d
-qtHaveModule(widgets): SUBDIRS += assimp-cpp
+qtHaveModule(widgets): SUBDIRS += assimp-cpp \
+    basicshapes-cpp
diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml
index 72d9787d6..180907113 100644
--- a/examples/qt3d/scene3d/AnimatedEntity.qml
+++ b/examples/qt3d/scene3d/AnimatedEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 import QtQuick 2.0 as QQ2
 
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index 1ddc58f3b..a54f32d13 100644
--- a/examples/qt3d/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml
index 322c7b9ac..93708cbe9 100644
--- a/examples/qt3d/shadow-map-qml/AdsMaterial.qml
+++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1
 
 Material {
diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml
index b863da3b5..e126547b5 100644
--- a/examples/qt3d/shadow-map-qml/GroundPlane.qml
+++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/Light.qml
index ca03f070f..e4a87830a 100644
--- a/examples/qt3d/shadow-map-qml/Light.qml
+++ b/examples/qt3d/shadow-map-qml/Light.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index b6932a76d..84dcd1f24 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 FrameGraph {
diff --git a/examples/qt3d/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml
index 61c803469..3ac2b64ce 100644
--- a/examples/qt3d/shadow-map-qml/Toyplane.qml
+++ b/examples/qt3d/shadow-map-qml/Toyplane.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/shadow-map-qml/Trefoil.qml b/examples/qt3d/shadow-map-qml/Trefoil.qml
index 341ee6c23..9eefd425e 100644
--- a/examples/qt3d/shadow-map-qml/Trefoil.qml
+++ b/examples/qt3d/shadow-map-qml/Trefoil.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp
index 2357106c7..ac08f5381 100644
--- a/examples/qt3d/shadow-map-qml/main.cpp
+++ b/examples/qt3d/shadow-map-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     view.resize(1600, 800);
diff --git a/examples/qt3d/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml
index 59040c39b..8bc021760 100644
--- a/examples/qt3d/shadow-map-qml/main.qml
+++ b/examples/qt3d/shadow-map-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: sceneRoot
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index d44271543..873df84dd 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -36,8 +36,8 @@
 
 #include <QGuiApplication>
 
+#include <window.h>
 #include <Qt3DCore/QEntity>
-#include <Qt3DCore/Window>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QCameraLens>
 #include <Qt3DCore/QTransform>
@@ -63,7 +63,7 @@
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-    Qt3D::Window view;
+    Window view;
 
     Qt3D::QAspectEngine engine;
     engine.registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp
index e74dc8b43..45385a76c 100644
--- a/examples/qt3d/simple-qml/main.cpp
+++ b/examples/qt3d/simple-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml
index c82bafaa3..9d9038d7d 100644
--- a/examples/qt3d/simple-qml/main.qml
+++ b/examples/qt3d/simple-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 Entity {
diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp
index 1141958fd..7f7afd225 100644
--- a/examples/qt3d/simple-shaders-qml/main.cpp
+++ b/examples/qt3d/simple-shaders-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml
index 22b6322be..89c2270e3 100644
--- a/examples/qt3d/simple-shaders-qml/main.qml
+++ b/examples/qt3d/simple-shaders-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.2 as QQ2
 
 Entity {
diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml
index 49d269bf5..f396484bc 100644
--- a/examples/qt3d/skybox/Skybox.qml
+++ b/examples/qt3d/skybox/Skybox.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
 
diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp
index 318b5181f..c585bf5fb 100644
--- a/examples/qt3d/skybox/main.cpp
+++ b/examples/qt3d/skybox/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/QRenderAspect>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml
index fbb3c90d0..e84d027d6 100644
--- a/examples/qt3d/skybox/main.qml
+++ b/examples/qt3d/skybox/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
    id: root
diff --git a/examples/qt3d/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml
index 062c84eff..385b40397 100644
--- a/examples/qt3d/tessellation-modes/BasicCamera.qml
+++ b/examples/qt3d/tessellation-modes/BasicCamera.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Camera {
diff --git a/examples/qt3d/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml
index b6c3122a9..39199af10 100644
--- a/examples/qt3d/tessellation-modes/TessellatedQuad.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import Qt3D.Examples 1.0
 import QtQuick 2.1 as QQ2
 
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 0b51fde2a..57d9a0b4d 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1
 
 Effect {
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml
index d66ad740c..c812e2295 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Material {
diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index df1ba87de..eee73d435 100644
--- a/examples/qt3d/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
@@ -36,7 +36,7 @@
 
 #include "tessellatedquadmesh.h"
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml
index 425ca40de..864081cb5 100644
--- a/examples/qt3d/tessellation-modes/main.qml
+++ b/examples/qt3d/tessellation-modes/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/torus-cpp/doc/src/torus-cpp.qdoc b/examples/qt3d/torus-cpp/doc/src/torus-cpp.qdoc
deleted file mode 100644
index 76f6d9782..000000000
--- a/examples/qt3d/torus-cpp/doc/src/torus-cpp.qdoc
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example torus-cpp
-    \title Qt3D: Torus C++ Example
-    \ingroup qt3d-examples-cpp
-*/
diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp
index d9c0ede88..d8fcbc269 100644
--- a/examples/qt3d/torus-qml/main.cpp
+++ b/examples/qt3d/torus-qml/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml
index 05398d10b..47ad51c83 100644
--- a/examples/qt3d/torus-qml/main.qml
+++ b/examples/qt3d/torus-qml/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: sceneRoot
diff --git a/examples/qt3d/wave/Background.qml b/examples/qt3d/wave/Background.qml
index d25edfabf..b9005c2b4 100644
--- a/examples/qt3d/wave/Background.qml
+++ b/examples/qt3d/wave/Background.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index be02664f7..ad2170d47 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml
index 740dd54ce..df21bcd5d 100644
--- a/examples/qt3d/wave/BasicCamera.qml
+++ b/examples/qt3d/wave/BasicCamera.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Camera {
     id: mainCamera
diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml
index 023631b9e..72badde5f 100644
--- a/examples/qt3d/wave/Wave.qml
+++ b/examples/qt3d/wave/Wave.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index bca3737b8..4391d71c2 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml
index 9f8031668..49e6be22b 100644
--- a/examples/qt3d/wave/WaveForwardRenderer.qml
+++ b/examples/qt3d/wave/WaveForwardRenderer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 TechniqueFilter {
     id: root
diff --git a/examples/qt3d/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml
index 1417b54cb..c1dda4695 100644
--- a/examples/qt3d/wave/WaveMaterial.qml
+++ b/examples/qt3d/wave/WaveMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Material {
     id: root
diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp
index b30248031..bd2e79f3e 100644
--- a/examples/qt3d/wave/main.cpp
+++ b/examples/qt3d/wave/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml
index b2e0c1bff..0836cecd1 100644
--- a/examples/qt3d/wave/main.qml
+++ b/examples/qt3d/wave/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import Qt3D.Input 2.0
 
 Entity {
diff --git a/examples/qt3d/wireframe/BasicCamera.qml b/examples/qt3d/wireframe/BasicCamera.qml
index 740dd54ce..df21bcd5d 100644
--- a/examples/qt3d/wireframe/BasicCamera.qml
+++ b/examples/qt3d/wireframe/BasicCamera.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Camera {
     id: mainCamera
diff --git a/examples/qt3d/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml
index 7b6faf852..47a3b49ba 100644
--- a/examples/qt3d/wireframe/TrefoilKnot.qml
+++ b/examples/qt3d/wireframe/TrefoilKnot.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Entity {
     id: root
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index c8fe3bef8..f413b2992 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Effect {
     id: root
diff --git a/examples/qt3d/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml
index 834ce657d..b8a08b29e 100644
--- a/examples/qt3d/wireframe/WireframeMaterial.qml
+++ b/examples/qt3d/wireframe/WireframeMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 
 Material {
     id: root
diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp
index e869a2fb4..a92e10a23 100644
--- a/examples/qt3d/wireframe/main.cpp
+++ b/examples/qt3d/wireframe/main.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DQuick/QQmlAspectEngine>
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Window view;
+    Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/qt3d/wireframe/main.qml b/examples/qt3d/wireframe/main.qml
index 8a9506c1c..ab739b187 100644
--- a/examples/qt3d/wireframe/main.qml
+++ b/examples/qt3d/wireframe/main.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D 2.0
-import Qt3D.Render 2.0
+import Qt3D.Renderer 2.0
 import QtQuick 2.1 as QQ2
 
 Entity {
author	Sean Harmer <sean.harmer@kdab.com>	2015-06-21 14:57:33 +0100
committer	Sean Harmer <sean.harmer@kdab.com>	2015-06-21 14:57:33 +0100
commit	099f466847039954c581030c2a5aa2bfce08e0eb (patch)
tree	194a94d15a68b0c38d2d45c12275afb2c91b9831 /examples
parent	7bbd402770fa27f944840c95b6a3c6121883bc58 (diff)
parent	b71f09d143002f15abfd4a407651544942a75c44 (diff)