diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-25 19:05:35 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-26 11:25:13 (GMT) |
| commit | df0e6759e8ebc1053f951d3a5398a41156e91913 (patch) | |
| tree | 18396f0e4763f37ada5acc3b6f60fd151d26fbaf /tests/auto/qmetaobject | |
| parent | e7eb7bdf63791ed03257f2f23b1f515e4d89e054 (diff) | |
| download | Qt-df0e6759e8ebc1053f951d3a5398a41156e91913.zip Qt-df0e6759e8ebc1053f951d3a5398a41156e91913.tar.gz Qt-df0e6759e8ebc1053f951d3a5398a41156e91913.tar.bz2 | |
QMetaObject::normalizeType: fix uses of const and template.
'const' was not removed from templated class
This even fixes compilation errors if using const return templated types
We can change the normalized signature in Qt 4.7 as it has already changed
and we have code to check that if moc revision < 5 it will
renormalize all the symbols
cf commit b881d8fb99972f1bd04ab4c84843cc8d43ddbeed
Task-number: QTBUG-7421
Reviewed-by: Brad
Reviewed-by: Kent Hansen
Diffstat (limited to 'tests/auto/qmetaobject')
| -rw-r--r-- | tests/auto/qmetaobject/tst_qmetaobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index bb4a0d2..e81607e 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -706,6 +706,12 @@ void tst_QMetaObject::normalizedSignature_data() QTest::newRow("const6") << "void foo(QList<const int>)" << "void foo(QList<const int>)"; QTest::newRow("const7") << "void foo(QList<const int*>)" << "void foo(QList<const int*>)"; QTest::newRow("const8") << "void foo(QList<int const*>)" << "void foo(QList<const int*>)"; + QTest::newRow("const9") << "void foo(const Foo<Bar>)" << "void foo(Foo<Bar>)"; + QTest::newRow("const10") << "void foo(Foo<Bar>const)" << "void foo(Foo<Bar>)"; + QTest::newRow("const11") << "void foo(Foo<Bar> *const)" << "void foo(Foo<Bar>*const)"; + 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>)"; } void tst_QMetaObject::normalizedSignature() |