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

QmlDesigner: Fix Qt5 compilation

Browse Source 
QQuick3DViewport::pickAll was introduced in Qt 6.2.
Checking against version 6.2.1 because that's when the global picking
API was taken into use in QmlDesigner.

Change-Id: Id69ff9d958da89ba9e043dfb082a99f640884a4e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-12-07 14:47:31 +02:00
parent c22c22c3d6
commit a4c2f2fb8c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.cpp
View File

@@ -898,7 +898,12 @@ bool MouseArea3D::eventFilter(QObject *, QEvent *event)
// a problem // a problem
onCircle = false; onCircle = false;
if (m_pickNode) { if (m_pickNode) {
// We need to pick all as various other geometries can often be the first #if QT_VERSION < QT_VERSION_CHECK(6, 2, 1)
QQuick3DPickResult pr = m_view3D->pick(float(mousePos.x()), float(mousePos.y()));
pickSuccess = pr.objectHit() == m_pickNode;
#else
// With the introduction of global picking API,
// we need to pick all as various other geometries can often be the first
// pick result, such as camera frustum or light geometry // pick result, such as camera frustum or light geometry
const QList<QQuick3DPickResult> results = m_view3D->pickAll(float(mousePos.x()), const QList<QQuick3DPickResult> results = m_view3D->pickAll(float(mousePos.x()),
float(mousePos.y())); float(mousePos.y()));
@@ -908,6 +913,7 @@ bool MouseArea3D::eventFilter(QObject *, QEvent *event)
break; break;
} }
} }
#endif
} }
} }
} }