diff options
| author | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
| commit | ff8c99eb54f33108709f9f3107b35780a80f3f17 (patch) | |
| tree | 11d4c08809bf90fd8b25b175b4903ab00d36e3d6 /tests/auto/moc | |
| parent | 28c7e17d9eeb8264ad9e26a5b93e5ff744add9a6 (diff) | |
| parent | 7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (diff) | |
| download | Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.zip Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.gz Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.bz2 | |
Merge remote branch 'qt-mainline/master'
Conflicts:
configure
Diffstat (limited to 'tests/auto/moc')
| -rw-r--r-- | tests/auto/moc/tst_moc.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 203f0ae..7a8f958 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -497,7 +497,7 @@ private slots: void revisions(); void warnings_data(); void warnings(); - + void privateClass(); signals: void sigWithUnsignedArg(unsigned foo); @@ -517,6 +517,7 @@ private: private: QString qtIncludePath; + class PrivateClass; }; void tst_Moc::initTestCase() @@ -1648,6 +1649,25 @@ void tst_Moc::warnings() } +class tst_Moc::PrivateClass : public QObject { + Q_PROPERTY(int someProperty READ someSlot WRITE someSlot2) +Q_OBJECT +Q_SIGNALS: + void someSignal(); +public Q_SLOTS: + int someSlot() { return 1; } + void someSlot2(int) {} +public: + Q_INVOKABLE PrivateClass() {} +}; + +void tst_Moc::privateClass() +{ + QVERIFY(PrivateClass::staticMetaObject.indexOfConstructor("PrivateClass()") == 0); + QVERIFY(PrivateClass::staticMetaObject.indexOfSignal("someSignal()") > 0); +} + + QTEST_APPLESS_MAIN(tst_Moc) #include "tst_moc.moc" |