summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2020-08-30 19:43:59 +0200
committerMarcel Krems <m.krems@software-vision.eu>2020-09-07 04:36:16 +0200
commitc93b91c766dc02efdb1955fb5a8a937c75108981 (patch)
tree5b0cc2c665b1aed0ea230eacb32ecb98c5d8eff5 /tests
parent4e2656a6d2de3be6cb98cbb98bbadf17815dae48 (diff)
Remove deprecated method QQuaternion::conjugate
Change-Id: If539e47618357ef329925033842f266447632e6f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
index 632460f5ff..3db53be2ab 100644
--- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -121,8 +121,8 @@ private slots:
void negate_data();
void negate();
- void conjugate_data();
- void conjugate();
+ void conjugated_data();
+ void conjugated();
void fromAxisAndAngle_data();
void fromAxisAndAngle();
@@ -763,12 +763,12 @@ void tst_QQuaternion::negate()
}
// Test quaternion conjugate calculations.
-void tst_QQuaternion::conjugate_data()
+void tst_QQuaternion::conjugated_data()
{
// Use the same test data as the add test.
add_data();
}
-void tst_QQuaternion::conjugate()
+void tst_QQuaternion::conjugated()
{
QFETCH(float, x1);
QFETCH(float, y1);
@@ -778,9 +778,6 @@ void tst_QQuaternion::conjugate()
QQuaternion v1(w1, x1, y1, z1);
QQuaternion v2(w1, -x1, -y1, -z1);
-#if QT_DEPRECATED_SINCE(5, 5)
- QCOMPARE(v1.conjugate(), v2);
-#endif
QCOMPARE(v1.conjugated(), v2);
}