Move temporary window class to examples

So as to avoid public header without a QPrefix. Real integration
points will be added later.

Also removed it from the Qt3D namespace and fixed linkage.

Task-number: QTBUG-46617
Change-Id: I1bea09f45f5fdba3d658b57b86b907ab57164479
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

32 files changed, 192 insertions, 57 deletions

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/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/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index 3aa42f7f8..dc2317948 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -38,7 +38,7 @@
 
 #include <QGuiApplication>
 
-#include <Qt3DCore/window.h>
+#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -74,7 +74,7 @@
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    Qt3D::Window *view = new Qt3D::Window();
+    Window *view = new Window();
     QWidget *container = QWidget::createWindowContainer(view);
 
     QSize screenSize = view->screen()->size();
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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/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/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/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/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/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());