blob: 7cbfc534bab6ee328886a3e052af64b0bd64df3a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Uses private parts of the QtQuick3D api which added a namespace in [1].
Update: upstream has done a better fix in [2] (but can stick to the
simple version check until next release).
[1] https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
[2] https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -803,5 +803,9 @@
const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
+ return QSSGUtils::mat44::getPosition(sceneTransform);
+#else
return mat44::getPosition(sceneTransform);
+#endif
}
--- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
@@ -738,5 +738,9 @@
const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
+ return QSSGUtils::mat44::getPosition(sceneTransform);
+#else
return mat44::getPosition(sceneTransform);
+#endif
}
|
GitWeb
