diff -r b72c6db6890b -r 5dc02b23752f tests/auto/moc/tst_moc.cpp --- a/tests/auto/moc/tst_moc.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/tests/auto/moc/tst_moc.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -1302,6 +1302,26 @@ QCOMPARE(o.value2(), 82); } +class QTBUG7421_ReturnConstTemplate: public QObject +{ Q_OBJECT +public slots: + const QList returnConstTemplate1() { return QList(); } + QList const returnConstTemplate2() { return QList(); } + const int returnConstInt() { return 0; } + const QString returnConstString(const QString s) { return s; } + QString const returnConstString2( QString const s) { return s; } +}; + +class QTBUG9354_constInName: public QObject +{ Q_OBJECT +public slots: + void slotChooseScientificConst0(struct science_constant const &) {}; + void foo(struct science_const const &) {}; + void foo(struct constconst const &) {}; + void foo(struct constconst *) {}; + void foo(struct const_ *) {}; +}; + QTEST_APPLESS_MAIN(tst_Moc) #include "tst_moc.moc"