diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-07 05:08:30 (GMT) |
| commit | 569dfab376d9f63422791566d1888618934ffdc3 (patch) | |
| tree | 7098d0e33f0cdb19b144f33318210bf801575c42 /tests/auto/moc/namespaced-flags.h | |
| parent | e68fa8d463ff10f7eb2b486362ef73eea9271ff8 (diff) | |
| parent | bd23da275dc88951e17137ef02147c9b5499bce7 (diff) | |
| download | Qt-569dfab376d9f63422791566d1888618934ffdc3.zip Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.gz Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/moc/namespaced-flags.h')
| -rw-r--r-- | tests/auto/moc/namespaced-flags.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/moc/namespaced-flags.h b/tests/auto/moc/namespaced-flags.h index d3f9548..b366447 100644 --- a/tests/auto/moc/namespaced-flags.h +++ b/tests/auto/moc/namespaced-flags.h @@ -62,13 +62,18 @@ namespace Foo { Q_OBJECT //Q_PROPERTY( Bar::Flags flags READ flags WRITE setFlags ) // triggers assertion Q_PROPERTY( Foo::Bar::Flags flags READ flags WRITE setFlags ) // fails to compile, or with the same assertion if moc fix is applied + Q_PROPERTY( QList<Foo::Bar::Flags> flagsList READ flagsList WRITE setFlagsList ) public: explicit Baz( QObject * parent=0 ) : QObject( parent ), mFlags() {} void setFlags( Bar::Flags f ) { mFlags = f; } Bar::Flags flags() const { return mFlags; } + + void setFlagsList( const QList<Bar::Flags> &f ) { mList = f; } + QList<Bar::Flags> flagsList() const { return mList; } private: Bar::Flags mFlags; + QList<Bar::Flags> mList; }; } |