diff options
| author | Marc Mutz <[email protected]> | 2025-07-04 11:16:45 +0200 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2025-07-04 15:04:44 +0200 |
| commit | 098bd223ce5696352e5625c8a8fda563d7f5514b (patch) | |
| tree | 141e99e4c3675dfb8fcdc0dc0867f67eadcba89d /src/quick3dphysics/qphysicsworld.cpp | |
| parent | b2b5a6e38eb244929d3c9b0da2be5698e9ecbfee (diff) | |
qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.
Picking all the way back, even though the include removal won't be
picked as far back, because it's the correct thing to do and cannot
fail.
Also remove the qquaternion.h include from qphysicscommands_p.h, which
doesn't need it, and replace it with qgenericmatrix.h for QMatrix3x3.
Appears to amend all the way back to the initial commit,
55c81ede6a45f1fd1f7c5ad299b230f5878b8d70.
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I551efcbc03a8f6b56e4a7f8531075c273d39b497
Reviewed-by: Jonas Karlsson <[email protected]>
Diffstat (limited to 'src/quick3dphysics/qphysicsworld.cpp')
| -rw-r--r-- | src/quick3dphysics/qphysicsworld.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3dphysics/qphysicsworld.cpp b/src/quick3dphysics/qphysicsworld.cpp index 7ffaf94..ef445a5 100644 --- a/src/quick3dphysics/qphysicsworld.cpp +++ b/src/quick3dphysics/qphysicsworld.cpp @@ -28,6 +28,8 @@ #include <QtQuick3D/private/qquick3dprincipledmaterial_p.h> #include <QtQuick3DUtils/private/qssgutils_p.h> +#include <QtGui/qquaternion.h> + #include <QtEnvironmentVariables> #define PHYSX_ENABLE_PVD 0 |