diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 17:51:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 17:51:10 (GMT) |
| commit | dd999ed377cdb2198cc9cbd405e636cc996ea4a7 (patch) | |
| tree | f1ade6ef710d9cc24586c5e5e663d2ef86950011 /src | |
| parent | 0d02bf894a1f3f494a4787ddfaf0e3bcd02affa2 (diff) | |
| parent | ca204e26f0c94a3f7ffbf2dfdf99ead5fa3ef33a (diff) | |
| download | Qt-dd999ed377cdb2198cc9cbd405e636cc996ea4a7.zip Qt-dd999ed377cdb2198cc9cbd405e636cc996ea4a7.tar.gz Qt-dd999ed377cdb2198cc9cbd405e636cc996ea4a7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix compilation with namespace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmllist.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h index cedc35b..5528d8d 100644 --- a/src/declarative/qml/qmllist.h +++ b/src/declarative/qml/qmllist.h @@ -133,10 +133,11 @@ private: friend class QmlListReferencePrivate; QmlListReferencePrivate* d; }; -Q_DECLARE_METATYPE(QmlListReference); QT_END_NAMESPACE +Q_DECLARE_METATYPE(QmlListReference); + QT_END_HEADER #endif // QMLLIST_H |