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/qscriptengine | |
| 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/qscriptengine')
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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)); |