diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-04-18 16:05:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-04-18 16:05:58 (GMT) |
| commit | ddb22795641253a026b72f752ebc769745dd41be (patch) | |
| tree | 149b270565a98054a03c615d0ce071b58bac53c0 /tests/auto/moc/tst_moc.cpp | |
| parent | b1c421239ddb16a6c259af2298e0608961a1f3ba (diff) | |
| parent | 6814998ab4d9c6b0990b0bf01119ace69363ce3e (diff) | |
| download | Qt-ddb22795641253a026b72f752ebc769745dd41be.zip Qt-ddb22795641253a026b72f752ebc769745dd41be.tar.gz Qt-ddb22795641253a026b72f752ebc769745dd41be.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
examples/webkit/webkit.pro
Diffstat (limited to 'tests/auto/moc/tst_moc.cpp')
| -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" |