It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES

Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>

3 files changed, 2 insertions, 8 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));
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index 5caac15..fc38a84 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -669,11 +669,9 @@ void tst_QObject::findChildren()
     l = qFindChildren<QObject*>(&o, "unnamed");
     QCOMPARE(l.size(), 0);
 
-#ifndef QT_NO_MEMBER_TEMPLATES
     tl = o.findChildren<QTimer *>("t1");
     QCOMPARE(tl.size(), 1);
     QCOMPARE(tl.at(0), &t1);
-#endif
 }
 
 
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 81fb749..04b2627 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -1909,7 +1909,6 @@ void tst_QScriptEngine::valueConversion()
         QString snum = qScriptValueToValue<QString>(num);
         QCOMPARE(snum, QLatin1String("123"));
     }
-#ifndef QT_NO_MEMBER_TEMPLATES
     {
         QScriptValue num = eng.toScriptValue(123);
         QCOMPARE(num.isNumber(), true);
@@ -1921,7 +1920,6 @@ void tst_QScriptEngine::valueConversion()
         QString snum = eng.fromScriptValue<QString>(num);
         QCOMPARE(snum, QLatin1String("123"));
     }
-#endif
     {
         QScriptValue num(&eng, 123);
         QCOMPARE(qScriptValueToValue<char>(num), char(123));