Remove the now useless QuickWindow

Change-Id: I714cf941230fdd83f0de37125bf44b4888662b25
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

20 files changed, 52 insertions, 184 deletions

diff --git a/examples/assimp/main.cpp b/examples/assimp/main.cpp
index a2e864437..cc5079435 100644
--- a/examples/assimp/main.cpp
+++ b/examples/assimp/main.cpp
@@ -41,9 +41,10 @@
 
 #include <exampleresources.h>
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QtQml>
@@ -54,7 +55,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/bigmodel-qml/main.cpp b/examples/bigmodel-qml/main.cpp
index f912f4cc6..629ebf34f 100644
--- a/examples/bigmodel-qml/main.cpp
+++ b/examples/bigmodel-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QtQml>
@@ -62,7 +63,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/cylinder-qml/main.cpp b/examples/cylinder-qml/main.cpp
index 8b7d5c2f4..6cd8b1d13 100644
--- a/examples/cylinder-qml/main.cpp
+++ b/examples/cylinder-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QtQml>
@@ -50,7 +51,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/deferred-renderer-qml/main.cpp b/examples/deferred-renderer-qml/main.cpp
index 371ca9cb2..6a8f9717c 100644
--- a/examples/deferred-renderer-qml/main.cpp
+++ b/examples/deferred-renderer-qml/main.cpp
@@ -40,9 +40,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -55,7 +56,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/gltf/main.cpp b/examples/gltf/main.cpp
index 00dac1331..7a03a7c59 100644
--- a/examples/gltf/main.cpp
+++ b/examples/gltf/main.cpp
@@ -40,9 +40,10 @@
 ****************************************************************************/
 
 #include <exampleresources.h>
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QtQml>
@@ -53,7 +54,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/keyboardinput-qml/main.cpp b/examples/keyboardinput-qml/main.cpp
index 616cb8d7b..bd4880e5f 100644
--- a/examples/keyboardinput-qml/main.cpp
+++ b/examples/keyboardinput-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 
@@ -49,7 +50,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/loader-qml/main.cpp b/examples/loader-qml/main.cpp
index 3488ffa52..a8fef8756 100644
--- a/examples/loader-qml/main.cpp
+++ b/examples/loader-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 
@@ -49,7 +50,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/materials/main.cpp b/examples/materials/main.cpp
index 3adf1e08d..de7c0167b 100644
--- a/examples/materials/main.cpp
+++ b/examples/materials/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -54,7 +55,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/multiviewport/main.cpp b/examples/multiviewport/main.cpp
index d332c2e7b..9787a77f0 100644
--- a/examples/multiviewport/main.cpp
+++ b/examples/multiviewport/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -50,7 +51,7 @@
 int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
diff --git a/examples/playground-qml/main.cpp b/examples/playground-qml/main.cpp
index 16872054c..ddf02e89e 100644
--- a/examples/playground-qml/main.cpp
+++ b/examples/playground-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -54,7 +55,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/rollerball/main.cpp b/examples/rollerball/main.cpp
index 89b32c4fe..a5ad91ea4 100644
--- a/examples/rollerball/main.cpp
+++ b/examples/rollerball/main.cpp
@@ -39,10 +39,11 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DBulletPhysics/bulletphysicsaspect.h>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -55,7 +56,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/shadow-map-qml/main.cpp b/examples/shadow-map-qml/main.cpp
index 886dfe35a..b3b6af159 100644
--- a/examples/shadow-map-qml/main.cpp
+++ b/examples/shadow-map-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QQmlContext>
@@ -55,7 +56,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     view.resize(1600, 800);
diff --git a/examples/simple-qml/main.cpp b/examples/simple-qml/main.cpp
index 3488ffa52..a8fef8756 100644
--- a/examples/simple-qml/main.cpp
+++ b/examples/simple-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 
@@ -49,7 +50,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/tessellation-modes/main.cpp b/examples/tessellation-modes/main.cpp
index 7b503356a..1191a9b76 100644
--- a/examples/tessellation-modes/main.cpp
+++ b/examples/tessellation-modes/main.cpp
@@ -41,9 +41,10 @@
 
 #include "tessellatedquadmesh.h"
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -56,7 +57,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/torus-qml/main.cpp b/examples/torus-qml/main.cpp
index baa6daefb..7177e0783 100644
--- a/examples/torus-qml/main.cpp
+++ b/examples/torus-qml/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <QGuiApplication>
 #include <QtQml>
@@ -50,7 +51,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/wave/main.cpp b/examples/wave/main.cpp
index 2b580c5d1..e34f9e148 100644
--- a/examples/wave/main.cpp
+++ b/examples/wave/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/qinputaspect.h>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -54,7 +55,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/examples/wireframe/main.cpp b/examples/wireframe/main.cpp
index 1dbdec85e..6939f8f59 100644
--- a/examples/wireframe/main.cpp
+++ b/examples/wireframe/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DQuick/quickwindow.h>
+#include <Qt3DCore/window.h>
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DInput/QInputAspect>
+#include <Qt3DQuick/QQmlAspectEngine>
 
 #include <exampleresources.h>
 
@@ -54,7 +55,7 @@ int main(int argc, char* argv[])
 
     initializeAssetResources("../exampleresources/example-assets.qrb");
 
-    Qt3D::Quick::QuickWindow view;
+    Qt3D::Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index a065b685a..9db761e66 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -16,13 +16,12 @@ gcov {
 
 HEADERS += \
     qt3dquick_global.h \
-    quickwindow.h \
     qt3dquick_global_p.h \
     qt3dquickvaluetypes_p.h \
     qqmlaspectengine.h \
     qqmlaspectengine_p.h
 
-SOURCES += quickwindow.cpp \
+SOURCES += \
     qt3dquick_global.cpp \
     qt3dquickvaluetypes.cpp \
     qqmlaspectengine.cpp
diff --git a/src/quick3d/quick3d/quickwindow.cpp b/src/quick3d/quick3d/quickwindow.cpp
deleted file mode 100644
index c176b510f..000000000
--- a/src/quick3d/quick3d/quickwindow.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** 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:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quickwindow.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-QuickWindow *QuickWindow::m_instance = Q_NULLPTR;
-
-QuickWindow::QuickWindow(QScreen *screen)
-    : Window(screen)
-{
-
-    // HACKED TO BE ABLE TO ASSIGN CAMERA TO CONTROLLER
-    // FROM QML EASILY
-    QuickWindow::m_instance = this;
-}
-
-QuickWindow *QuickWindow::getInstance()
-{
-    return QuickWindow::m_instance;
-}
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/quickwindow.h b/src/quick3d/quick3d/quickwindow.h
deleted file mode 100644
index e666316f0..000000000
--- a/src/quick3d/quick3d/quickwindow.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** 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:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3D_QUICK_QUICKWINDOW_H
-#define QT3D_QUICK_QUICKWINDOW_H
-
-#include <QWindow>
-#include <QQmlEngine>
-
-#include <Qt3DQuick/qt3dquick_global.h>
-#include <Qt3DQuick/qqmlaspectengine.h>
-#include <Qt3DCore/window.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-namespace Quick {
-
-class Quick3DConfiguration;
-
-class QT3DQUICKSHARED_EXPORT QuickWindow : public Qt3D::Window
-{
-    Q_OBJECT
-public:
-    explicit QuickWindow(QScreen *screen = 0);
-
-    static QuickWindow *getInstance();
-
-private:
-    static QuickWindow *m_instance;
-};
-
-} // Quick
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QUICK_QUICKWINDOW_H