diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-09 09:16:19 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-09 09:16:19 (GMT) |
| commit | 83385a08b72f1726c0a234ac597d33897c51a995 (patch) | |
| tree | 0afa484631bd8157bb82ea8df5e7d77b90c95ad1 /src/declarative/qml/qml.h | |
| parent | bd746fc9917682d6f211d7af16264be6327c5ee0 (diff) | |
| parent | 0286ecdb8fc87b2c42d215aaabcbbffb5c508f01 (diff) | |
| download | Qt-83385a08b72f1726c0a234ac597d33897c51a995.zip Qt-83385a08b72f1726c0a234ac597d33897c51a995.tar.gz Qt-83385a08b72f1726c0a234ac597d33897c51a995.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qml.h')
| -rw-r--r-- | src/declarative/qml/qml.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index c009093..859fd66 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -59,11 +59,11 @@ QT_MODULE(Declarative) #define QML_DECLARE_TYPE(TYPE) \ Q_DECLARE_METATYPE(TYPE *) \ - Q_DECLARE_METATYPE(QList<TYPE *> *) \ + Q_DECLARE_METATYPE(QmlListProperty<TYPE>) \ Q_DECLARE_METATYPE(QmlList<TYPE *> *) #define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \ - Q_DECLARE_METATYPE(QList<TYPE *> *) \ + Q_DECLARE_METATYPE(QmlListProperty<TYPE>) \ Q_DECLARE_METATYPE(QmlList<TYPE *> *) #define QML_DECLARE_INTERFACE(INTERFACE) \ |