diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-08-17 05:30:30 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-08-17 05:30:30 (GMT) |
| commit | ae1fde5d436a047c124f8382fdcd71bb1af306e3 (patch) | |
| tree | a937de1c678aaeda2f12fac891f49930d244e954 /tests/auto/qmetaobject/tst_qmetaobject.cpp | |
| parent | 50a53d2f7a7e12cd597dc72a08ad62b79fee4554 (diff) | |
| parent | 8afc6773067bb878020c29b3bebfe8662e3fbfdd (diff) | |
| download | Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.zip Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.gz Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tests/auto/qmetaobject/tst_qmetaobject.cpp')
| -rw-r--r-- | tests/auto/qmetaobject/tst_qmetaobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index df75ae8..ff39842 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -850,6 +850,8 @@ void tst_QMetaObject::normalizedSignature_data() QTest::newRow("const12") << "void foo(Foo<Bar>const*const *const)" << "void foo(Foo<Bar>*const*const)"; QTest::newRow("const13") << "void foo(const Foo<Bar>&)" << "void foo(Foo<Bar>)"; QTest::newRow("const14") << "void foo(Foo<Bar>const&)" << "void foo(Foo<Bar>)"; + + QTest::newRow("invalid1") << "a( b" << "a(b"; } void tst_QMetaObject::normalizedSignature() @@ -857,7 +859,7 @@ void tst_QMetaObject::normalizedSignature() QFETCH(QString, signature); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedSignature(signature.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedSignature(signature.toLatin1()), result.toLatin1()); } void tst_QMetaObject::normalizedType_data() @@ -895,7 +897,7 @@ void tst_QMetaObject::normalizedType() QFETCH(QString, type); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedType(type.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1()); } void tst_QMetaObject::customPropertyType() |