From 0269afd106da5d4d999585b3bdb1332a2c01af12 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sun, 30 Aug 2015 16:39:18 +0100 Subject: Move Input aspect to Qt3DInput namespace Also update examples accordingly. Change-Id: I8d19c3165899e4b7b791deb33098af4fb439f44a Reviewed-by: Paul Lemire --- examples/qt3d/anaglyph-rendering/main.cpp | 2 +- examples/qt3d/assimp-cpp/main.cpp | 2 +- examples/qt3d/assimp/main.cpp | 2 +- examples/qt3d/basicshapes-cpp/main.cpp | 2 +- examples/qt3d/bigmodel-qml/main.cpp | 2 +- examples/qt3d/bigscene-cpp/main.cpp | 2 +- examples/qt3d/bigscene-instanced-qml/main.cpp | 2 +- examples/qt3d/clip-planes-qml/main.cpp | 2 +- examples/qt3d/cpp_example/main.cpp | 2 +- examples/qt3d/custom-mesh-cpp/main.cpp | 2 +- examples/qt3d/cylinder-cpp/main.cpp | 2 +- examples/qt3d/cylinder-qml/main.cpp | 2 +- examples/qt3d/deferred-renderer-cpp/main.cpp | 2 +- examples/qt3d/deferred-renderer-qml/main.cpp | 2 +- examples/qt3d/dynamicscene-cpp/main.cpp | 2 +- examples/qt3d/gltf/main.cpp | 2 +- examples/qt3d/gooch-qml/main.cpp | 2 +- examples/qt3d/keyboardinput-qml/main.cpp | 2 +- examples/qt3d/loader-qml/main.cpp | 2 +- examples/qt3d/materials-cpp/main.cpp | 2 +- examples/qt3d/materials/main.cpp | 2 +- examples/qt3d/mouseinput-qml/main.cpp | 2 +- examples/qt3d/multiviewport/main.cpp | 2 +- examples/qt3d/playground-qml/main.cpp | 2 +- examples/qt3d/shadow-map-qml/main.cpp | 2 +- examples/qt3d/simple-cpp/main.cpp | 2 +- examples/qt3d/simple-qml/main.cpp | 2 +- examples/qt3d/simple-shaders-qml/main.cpp | 2 +- examples/qt3d/skybox/main.cpp | 2 +- examples/qt3d/tessellation-modes/main.cpp | 2 +- examples/qt3d/torus-qml/main.cpp | 2 +- examples/qt3d/transparency-qml/main.cpp | 2 +- examples/qt3d/wave/main.cpp | 2 +- examples/qt3d/wireframe/main.cpp | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) (limited to 'examples/qt3d') diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp index 6072269ae..14f76c605 100644 --- a/examples/qt3d/anaglyph-rendering/main.cpp +++ b/examples/qt3d/anaglyph-rendering/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index 4b4048c6c..2b2670c02 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -107,7 +107,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; - Qt3D::QInputAspect *inputAspect = new Qt3D::QInputAspect(); + Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect(); engine.registerAspect(new Qt3D::QRenderAspect()); engine.registerAspect(inputAspect); engine.initialize(); diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 8ada5287c..651766019 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 1e122c65e..f3e5a9129 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -91,7 +91,7 @@ int main(int argc, char **argv) Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index 5d57b0694..d11e9e5c7 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 082c0779f..2b347d80b 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -66,7 +66,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.cpp +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp index 1f2035d3e..e8d6e6505 100644 --- a/examples/qt3d/clip-planes-qml/main.cpp +++ b/examples/qt3d/clip-planes-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 2bc079e25..1745aed42 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -74,7 +74,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index c17c71906..e26f9827b 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 01e6c7cf7..d8a55c670 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp index 53a1a94b9..2adbf32d8 100644 --- a/examples/qt3d/cylinder-qml/main.cpp +++ b/examples/qt3d/cylinder-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index dfa3d3f64..129d3174d 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -69,7 +69,7 @@ int main(int ac, char **av) QGuiApplication app(ac, av); Qt3D::QWindow view; - Qt3D::QInputAspect *input = new Qt3D::QInputAspect(); + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect(); view.registerAspect(input); // Root entity diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp index efbe03d70..16145787a 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/examples/qt3d/deferred-renderer-qml/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 4d43ba59b..27ca086bd 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index 9cd7025fa..112661bef 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp index 29296db79..eaf35b0a3 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/examples/qt3d/gooch-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index 0797d355f..52bf03e48 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/examples/qt3d/loader-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 057f4f35e..0ea77c728 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index 160831d3e..a49c87a1c 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp index 2751fe41a..c06af988d 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/examples/qt3d/mouseinput-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index bb64bf2c7..3c9fe15fc 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -48,7 +48,7 @@ int main(int ac, char **av) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp index 9b2ff6e0b..00379f54a 100644 --- a/examples/qt3d/playground-qml/main.cpp +++ b/examples/qt3d/playground-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index ac08f5381..f9b744e8c 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char* argv[]) view.resize(1600, 800); engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 431b0ac8a..2755b37cc 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); Qt3D::QWindow view; - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; view.registerAspect(input); // Root entity diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp index 7f7afd225..0000a11c0 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/examples/qt3d/simple-shaders-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp index c585bf5fb..d58eb8a9c 100644 --- a/examples/qt3d/skybox/main.cpp +++ b/examples/qt3d/skybox/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp index eee73d435..bc2b79cd9 100644 --- a/examples/qt3d/tessellation-modes/main.cpp +++ b/examples/qt3d/tessellation-modes/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index d8fcbc269..f2e3f76ab 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp index 50256fd2f..9034e7f4a 100644 --- a/examples/qt3d/transparency-qml/main.cpp +++ b/examples/qt3d/transparency-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index bd2e79f3e..802eef8ea 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index a92e10a23..21d971c79 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); -- cgit v1.2.3