diff options
33 files changed, 65 insertions, 86 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/src/core/window.cpp b/examples/qt3d/common/window.cpp index 9a71b6f7b..433942f25 100644 --- a/src/core/window.cpp +++ b/examples/qt3d/common/window.cpp @@ -37,20 +37,9 @@ #include "window.h" #include <QKeyEvent> -#include <QMouseEvent> #include <QGuiApplication> #include <QOpenGLContext> -#include "qnode.h" -#include "qcamera.h" -#include "qentity.h" -#include "qaspectengine.h" -#include <Qt3DCore/private/corelogging_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - Window::Window(QScreen *screen) : QWindow(screen) @@ -86,7 +75,3 @@ void Window::keyPressEvent( QKeyEvent* e ) QWindow::keyPressEvent( e ); } } - -} // namespace Qt3D - -QT_END_NAMESPACE diff --git a/src/core/window.h b/examples/qt3d/common/window.h index 3b7a7c990..7c6e3606e 100644 --- a/src/core/window.h +++ b/examples/qt3d/common/window.h @@ -34,17 +34,12 @@ ** ****************************************************************************/ -#ifndef QT3D_WINDOW_H -#define QT3D_WINDOW_H +#ifndef WINDOW_H +#define WINDOW_H #include <QWindow> -#include <Qt3DCore/qt3dcore_global.h> -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QT3DCORESHARED_EXPORT Window : public QWindow +class Window : public QWindow { Q_OBJECT public: @@ -55,8 +50,4 @@ protected: virtual void keyPressEvent(QKeyEvent *e); }; -} // namespace Qt3D - -QT_END_NAMESPACE - #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()); diff --git a/src/core/core.pri b/src/core/core.pri index 32bd30bc9..fc533627a 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -21,7 +21,6 @@ include (./services/services.pri) HEADERS += \ $$PWD/qt3dcore_global.h \ - $$PWD/window.h \ $$PWD/qtickclock_p.h \ $$PWD/qscheduler_p.h \ $$PWD/corelogging_p.h \ @@ -44,7 +43,6 @@ HEADERS += \ $$PWD/qt3dcore_global_p.h SOURCES += \ - $$PWD/window.cpp \ $$PWD/qtickclock.cpp \ $$PWD/qscheduler.cpp \ $$PWD/qchangearbiter.cpp \ |