diff --git a/src/3d/qgscamerapose.cpp b/src/3d/qgscamerapose.cpp
index 2c9172f67365..8be92fb05af1 100644
--- a/src/3d/qgscamerapose.cpp
+++ b/src/3d/qgscamerapose.cpp
@@ -62,9 +62,13 @@ void QgsCameraPose::setPitchAngle( float pitch )
   // prevent going over the head
   // prevent bug in QgsCameraPose::updateCamera when updating camera rotation.
   // With a mPitchAngle < 0.2 or > 179.8, QQuaternion::fromEulerAngles( mPitchAngle, mHeadingAngle, 0 )
-  // will return bad rotation angle.
+  // will return bad rotation angle in Qt5.
   // See https://bugreports.qt.io/browse/QTBUG-72103
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
   mPitchAngle = std::clamp( pitch, 0.2f, 179.8f );
+#else
+  mPitchAngle = std::clamp( pitch, 0.0f, 180.0f );
+#endif
 }
 
 void QgsCameraPose::updateCamera( Qt3DRender::QCamera *camera )
diff --git a/tests/testdata/control_images/3d/expected_4978_line_rendering_1/expected_4978_line_rendering_1.png b/tests/testdata/control_images/3d/expected_4978_line_rendering_1/default/expected_4978_line_rendering_1.png
similarity index 100%
rename from tests/testdata/control_images/3d/expected_4978_line_rendering_1/expected_4978_line_rendering_1.png
rename to tests/testdata/control_images/3d/expected_4978_line_rendering_1/default/expected_4978_line_rendering_1.png
diff --git a/tests/testdata/control_images/3d/expected_4978_line_rendering_1/expected_4978_line_rendering_1_mask.png b/tests/testdata/control_images/3d/expected_4978_line_rendering_1/default/expected_4978_line_rendering_1_mask.png
similarity index 100%
rename from tests/testdata/control_images/3d/expected_4978_line_rendering_1/expected_4978_line_rendering_1_mask.png
rename to tests/testdata/control_images/3d/expected_4978_line_rendering_1/default/expected_4978_line_rendering_1_mask.png
diff --git a/tests/testdata/control_images/3d/expected_4978_line_rendering_1/qt6/expected_4978_line_rendering_1.png b/tests/testdata/control_images/3d/expected_4978_line_rendering_1/qt6/expected_4978_line_rendering_1.png
new file mode 100644
index 000000000000..e0615a2d39d5
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_4978_line_rendering_1/qt6/expected_4978_line_rendering_1.png differ
diff --git a/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1.png b/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1.png
new file mode 100644
index 000000000000..74a3187840c5
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1.png differ
diff --git a/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1_mask.png b/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1_mask.png
new file mode 100644
index 000000000000..748e1fa685b8
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1_mask.png differ
diff --git a/tests/testdata/control_images/3d/expected_flat_terrain_1/expected_flat_terrain_1.png b/tests/testdata/control_images/3d/expected_flat_terrain_1/default/expected_flat_terrain_1.png
similarity index 100%
rename from tests/testdata/control_images/3d/expected_flat_terrain_1/expected_flat_terrain_1.png
rename to tests/testdata/control_images/3d/expected_flat_terrain_1/default/expected_flat_terrain_1.png
diff --git a/tests/testdata/control_images/3d/expected_flat_terrain_1/qt6/expected_flat_terrain_1.png b/tests/testdata/control_images/3d/expected_flat_terrain_1/qt6/expected_flat_terrain_1.png
new file mode 100644
index 000000000000..148a3083b421
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_flat_terrain_1/qt6/expected_flat_terrain_1.png differ
diff --git a/tests/testdata/control_images/3d/expected_line_rendering_1/qt6/expected_line_rendering_1.png b/tests/testdata/control_images/3d/expected_line_rendering_1/qt6/expected_line_rendering_1.png
new file mode 100644
index 000000000000..cc26ef836481
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_line_rendering_1/qt6/expected_line_rendering_1.png differ
diff --git a/tests/testdata/control_images/3d/expected_terrain_theme/expected_terrain_theme.png b/tests/testdata/control_images/3d/expected_terrain_theme/default/expected_terrain_theme.png
similarity index 100%
rename from tests/testdata/control_images/3d/expected_terrain_theme/expected_terrain_theme.png
rename to tests/testdata/control_images/3d/expected_terrain_theme/default/expected_terrain_theme.png
diff --git a/tests/testdata/control_images/3d/expected_terrain_theme/qt6/expected_terrain_theme.png b/tests/testdata/control_images/3d/expected_terrain_theme/qt6/expected_terrain_theme.png
new file mode 100644
index 000000000000..155b1580fd0a
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_terrain_theme/qt6/expected_terrain_theme.png differ