summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2020-08-24 19:33:18 +0200
committerMarcel Krems <m.krems@software-vision.eu>2020-08-26 01:49:24 +0200
commit8dd50ef206f384ac781d6bb9ca5e254851531298 (patch)
tree85f612d1c12b53d544757440b09e886d23a6c07f /tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
parentba9c4ee2cbcfc2513e9e5a3973eac207115aadfd (diff)
Remove deprecated qGenericMatrix{To,From}Matrix4x4 functions
Change-Id: I3b43d48f5324f3a1f2fff8e22bb4f9563d3ea997 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp')
-rw-r--r--tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index 26e22e5883..b55cc2b007 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -2860,11 +2860,6 @@ void tst_QMatrixNxN::convertGeneric()
QMatrix4x4 m4(m1);
QVERIFY(isSame(m4, unique4x4));
-#if QT_DEPRECATED_SINCE(5, 0)
- QMatrix4x4 m5 = qGenericMatrixToMatrix4x4(m1);
- QVERIFY(isSame(m5, unique4x4));
-#endif
-
static float const conv4x4[12] = {
1.0f, 2.0f, 3.0f, 4.0f,
5.0f, 6.0f, 7.0f, 8.0f,
@@ -2874,11 +2869,6 @@ void tst_QMatrixNxN::convertGeneric()
QMatrix4x3 m10 = m9.toGenericMatrix<4, 3>();
QVERIFY(isSame(m10, conv4x4));
-
-#if QT_DEPRECATED_SINCE(5, 0)
- QMatrix4x3 m11 = qGenericMatrixFromMatrix4x4<4, 3>(m9);
- QVERIFY(isSame(m11, conv4x4));
-#endif
}
// Copy of "flagBits" in qmatrix4x4.h.