feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix puppet build after quick3d private API changes

Browse Source 
Change-Id: I3668853886306fe00d5da916aa458559964a9af0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 9817df63fb)
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-04-20 15:26:09 +03:00
parent 0f3a92b45a
commit 6652996503
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
View File

@@ -215,6 +215,7 @@ QVector4D GeneralHelper::focusNodesToCamera(QQuick3DCamera *camera, float defaul
if (auto renderModel = static_cast<QSSGRenderModel *>(targetPriv->spatialNode)) {
QWindow *window = static_cast<QWindow *>(viewPort->window());
if (window) {
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
QSSGRef<QSSGRenderContextInterface> context;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
context = QSSGRenderContextInterface::getRenderContextInterface(quintptr(window));
@@ -222,12 +223,17 @@ QVector4D GeneralHelper::focusNodesToCamera(QQuick3DCamera *camera, float defaul
context = targetPriv->sceneManager->rci;
#endif
if (!context.isNull()) {
#else
const auto &sm = targetPriv->sceneManager;
auto context = sm->wattached ? sm->wattached->rci().get() : nullptr;
if (context) {
#endif
QSSGBounds3 bounds;
auto geometry = qobject_cast<SelectionBoxGeometry *>(model->geometry());
if (geometry) {
bounds = geometry->bounds();
} else {
auto bufferManager = context->bufferManager();
const auto &bufferManager(context->bufferManager());
#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
bounds = renderModel->getModelBounds(bufferManager);
#else
@@ -889,6 +895,7 @@ bool GeneralHelper::getBounds(QQuick3DViewport *view3D, QQuick3DNode *node, QVec
if (auto renderModel = static_cast<QSSGRenderModel *>(renderNode)) {
QWindow *window = static_cast<QWindow *>(view3D->window());
if (window) {
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
QSSGRef<QSSGRenderContextInterface> context;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
context = QSSGRenderContextInterface::getRenderContextInterface(quintptr(window));
@@ -896,7 +903,12 @@ bool GeneralHelper::getBounds(QQuick3DViewport *view3D, QQuick3DNode *node, QVec
context = QQuick3DObjectPrivate::get(node)->sceneManager->rci;
#endif
if (!context.isNull()) {
auto bufferManager = context->bufferManager();
#else
const auto &sm = QQuick3DObjectPrivate::get(node)->sceneManager;
auto context = sm->wattached ? sm->wattached->rci().get() : nullptr;
if (context) {
#endif
const auto &bufferManager(context->bufferManager());
#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
QSSGBounds3 bounds = renderModel->getModelBounds(bufferManager);
#else

10
src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
View File

@@ -287,14 +287,20 @@ void SelectionBoxGeometry::getBounds(
if (auto renderModel = static_cast<QSSGRenderModel *>(renderNode)) {
QWindow *window = static_cast<QWindow *>(m_view3D->window());
if (window) {
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
QSSGRef<QSSGRenderContextInterface> context;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
context = QSSGRenderContextInterface::getRenderContextInterface(quintptr(window));
#else
#elif QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
context = QQuick3DObjectPrivate::get(this)->sceneManager->rci;
#endif
if (!context.isNull()) {
auto bufferManager = context->bufferManager();
#else
const auto &sm = QQuick3DObjectPrivate::get(this)->sceneManager;
auto context = sm->wattached ? sm->wattached->rci().get() : nullptr;
if (context) {
#endif
const auto &bufferManager(context->bufferManager());
#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
QSSGBounds3 bounds = renderModel->getModelBounds(bufferManager);
#else