diff options
| author | miniak <milan.burda@gmail.com> | 2010-08-03 16:33:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 16:35:28 (GMT) |
| commit | 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 (patch) | |
| tree | a387f04203570a75e347abd78cf765e9903c9e36 /tests/auto/qmatrixnxn | |
| parent | 02e5a6c9abe9562ce2b2057c0b89f65d371c5b40 (diff) | |
| download | Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.zip Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.gz Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.bz2 | |
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'tests/auto/qmatrixnxn')
| -rw-r--r-- | tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp index 5709196..22c679a 100644 --- a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp +++ b/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp @@ -2822,10 +2822,9 @@ void tst_QMatrixNxN::convertGeneric() 9.0f, 10.0f, 11.0f, 12.0f, 0.0f, 0.0f, 0.0f, 1.0f }; -#if !defined(QT_NO_MEMBER_TEMPLATES) QMatrix4x4 m4(m1); QVERIFY(isSame(m4, unique4x4)); -#endif + QMatrix4x4 m5 = qGenericMatrixToMatrix4x4(m1); QVERIFY(isSame(m5, unique4x4)); @@ -2835,10 +2834,9 @@ void tst_QMatrixNxN::convertGeneric() 9.0f, 10.0f, 11.0f, 12.0f }; QMatrix4x4 m9(uniqueValues4); -#if !defined(QT_NO_MEMBER_TEMPLATES) + QMatrix4x3 m10 = m9.toGenericMatrix<4, 3>(); QVERIFY(isSame(m10, conv4x4)); -#endif QMatrix4x3 m11 = qGenericMatrixFromMatrix4x4<4, 3>(m9); QVERIFY(isSame(m11, conv4x4)); |