diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-21 00:43:19 (GMT) |
| commit | f6b1582d726f97d8be4b30f0f6da2350220f27c5 (patch) | |
| tree | 64bcea1b8b3cc8f94073a9e83b36b2b40ad990e8 /src/declarative/qml/qmlcustomparser_p.h | |
| parent | 110c58a20f3158143d83ebea4f2ece4f7925f913 (diff) | |
| parent | 7bd7f5ec6eb520b7d9940a24817b17132d9ed6a2 (diff) | |
| download | Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.zip Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.gz Qt-f6b1582d726f97d8be4b30f0f6da2350220f27c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcustomparser_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcustomparser_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 5be0680..eb3e579 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -127,8 +127,14 @@ protected: private: QList<QmlError> exceptions; }; -#define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, NAME, TYPE, CUSTOMTYPE) \ + +#if defined(Q_OS_SYMBIAN) +# define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, NAME, TYPE, CUSTOMTYPE) \ + static int defineCustomType##NAME = qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, #NAME, #TYPE, new CUSTOMTYPE); +#else +# define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, NAME, TYPE, CUSTOMTYPE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *,(VERSION_MAJ), (VERSION_MIN_FROM), (VERSION_MAJ_TO)>::instance(qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, #NAME, #TYPE, new CUSTOMTYPE)); +#endif QT_END_NAMESPACE |