diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 07:23:01 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 07:23:01 (GMT) |
| commit | a9f932ab1ee658ded7e5246248fded0655e9218a (patch) | |
| tree | 07b3829fc3f13ec1fda01cd8d4a6d8b88daf1997 /src/declarative/qml/qmlcustomparser_p.h | |
| parent | bf3f1cc5be0aa3965117441cb06bf37ce0c6c653 (diff) | |
| download | Qt-a9f932ab1ee658ded7e5246248fded0655e9218a.zip Qt-a9f932ab1ee658ded7e5246248fded0655e9218a.tar.gz Qt-a9f932ab1ee658ded7e5246248fded0655e9218a.tar.bz2 | |
Fix to use "." not "/" in QML_DEFINE_TYPE URIs
Fix to allow multiple version specifying defines.
Diffstat (limited to 'src/declarative/qml/qmlcustomparser_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcustomparser_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 3d55d3e..74bd15c 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -113,7 +113,7 @@ public: virtual void setCustomData(QObject *, const QByteArray &); }; #define QML_DEFINE_CUSTOM_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, NAME, TYPE, CUSTOMTYPE) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterCustomType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MAJ_TO, #NAME, #TYPE, new 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)); QT_END_NAMESPACE |