diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 21:29:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 21:29:40 (GMT) |
| commit | fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27 (patch) | |
| tree | a21225293db6881174814290ad7298120c4a078b /examples/declarative | |
| parent | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (diff) | |
| parent | 23eb677daea8e084fcaa1256f1a9433e324b1474 (diff) | |
| download | Qt-fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27.zip Qt-fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27.tar.gz Qt-fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix Phonon compilation with a namespaced Qt.
Fix build on WinCE and Symbian: .pro file must match dir name.
Fix compilation on solaris-g++: ctype functions are sometimes macros
Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/extending/attached/person.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/extending/attached/person.h index 0f86d8b..08caebf 100644 --- a/examples/declarative/extending/attached/person.h +++ b/examples/declarative/extending/attached/person.h @@ -76,7 +76,7 @@ QML_DECLARE_TYPE(ShoeDescription); class Person : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) -Q_PROPERTY(ShoeDescription *shoe READ shoe); +Q_PROPERTY(ShoeDescription *shoe READ shoe) public: Person(QObject *parent = 0); |