diff options
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | examples/qt3d/scene2d/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/scene3d/main.cpp | 2 | ||||
| -rw-r--r-- | src/render/raycasting/qboundingvolumeprovider_p.h | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index a1b41eda2..c9d0afb3c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 30ad4cf558789a0b332d7e038dcfe4f54718e937 + ref: f6d1be7c66782e718b23dc0905b60a975b19e14c required: true ../qtdeclarative: - ref: b65eee039092fa664e781cdd98a4bb5e66815218 + ref: 9d3d29d623a9e2c6067fc2cebf6d84dc7320f7f1 required: false ../qtshadertools: - ref: 48de8f6e780324884b3e49653a9ee1ad03d036ce + ref: eb43e75ed0b6e746a061a30a6bc3b71ac85f5f8c required: false diff --git a/examples/qt3d/scene2d/main.cpp b/examples/qt3d/scene2d/main.cpp index d4e2c4b1d..4981ae2fd 100644 --- a/examples/qt3d/scene2d/main.cpp +++ b/examples/qt3d/scene2d/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - QQuickWindow::setSceneGraphBackend(QSGRendererInterface::OpenGLRhi); + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.resize(1400, 1100); diff --git a/examples/qt3d/scene3d/main.cpp b/examples/qt3d/scene3d/main.cpp index 67eaadb4d..11d07c024 100644 --- a/examples/qt3d/scene3d/main.cpp +++ b/examples/qt3d/scene3d/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char **argv) QGuiApplication app(argc, argv); // Force OpenGL backend - QQuickWindow::setSceneGraphBackend(QSGRendererInterface::OpenGLRhi); + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); QQuickView view; view.resize(1024, 768); diff --git a/src/render/raycasting/qboundingvolumeprovider_p.h b/src/render/raycasting/qboundingvolumeprovider_p.h index 42b95dd30..1220d5d58 100644 --- a/src/render/raycasting/qboundingvolumeprovider_p.h +++ b/src/render/raycasting/qboundingvolumeprovider_p.h @@ -52,6 +52,7 @@ // #include <Qt3DRender/qt3drender_global.h> +#include <QVector> QT_BEGIN_NAMESPACE |