1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moc: test signature with (void)

Browse Source 
Change-Id: Id63ed21e9f5e7447ced877ec19a2786d20f439f0
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
Olivier Goffart 2012-03-02 12:41:43 +01:00 committed by Qt by Nokia
parent de38f914e8
commit 0731c90eec
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/tools/moc/slots-with-void-template.h
View File

@ -51,9 +51,11 @@ class SlotsWithVoidTemplateTest : public QObject
Q_OBJECT Q_OBJECT
public slots: public slots:
inline void dummySlot() {} inline void dummySlot() {}
inline void dummySlot2(void) {}
inline void anotherSlot(const TestTemplate<void> &) {} inline void anotherSlot(const TestTemplate<void> &) {}
inline TestTemplate<void> mySlot() { return TestTemplate<void>(); } inline TestTemplate<void> mySlot() { return TestTemplate<void>(); }
signals: signals:
void mySignal(const TestTemplate<void> &); void mySignal(const TestTemplate<void> &);
void myVoidSignal(); void myVoidSignal();
void myVoidSignal2(void);
}; };

2
tests/auto/tools/moc/tst_moc.cpp
View File

@ -874,6 +874,8 @@ void tst_Moc::slotsWithVoidTemplate()
&test, SLOT(dummySlot(void)))); &test, SLOT(dummySlot(void))));
QVERIFY(QObject::connect(&test, SIGNAL(mySignal(const TestTemplate<void> &)), QVERIFY(QObject::connect(&test, SIGNAL(mySignal(const TestTemplate<void> &)),
&test, SLOT(anotherSlot(const TestTemplate<void> &)))); &test, SLOT(anotherSlot(const TestTemplate<void> &))));
QVERIFY(QObject::connect(&test, SIGNAL(myVoidSignal2()),
&test, SLOT(dummySlot2())));
} }
void tst_Moc::structQObject() void tst_Moc::structQObject()