diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 01:32:46 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 01:32:46 (GMT) |
| commit | 6f7b1c9270131d2a55218b14f3ec29cc553c8e2f (patch) | |
| tree | 8161b08aad3e0cad07983707f0e4482cee0a36db /src/declarative/qml/qml.h | |
| parent | 8987d9c2946d2cc565cec562393ee3627582699f (diff) | |
| download | Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.zip Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.tar.gz Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.tar.bz2 | |
Allow span of versions to be defined, not just one.
Span is from version where introduced (all 4.6) to current QT_VERSION.
Diffstat (limited to 'src/declarative/qml/qml.h')
| -rw-r--r-- | src/declarative/qml/qml.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 5dd57bc..e7fbff3 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -76,11 +76,11 @@ QT_BEGIN_NAMESPACE #define QML_DEFINE_INTERFACE(INTERFACE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); -#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION, NAME, TYPE, EXTENSION) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, #VERSION, #NAME, #TYPE)); +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MIN_TO, NAME, TYPE, EXTENSION) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MIN_TO, #NAME, #TYPE)); -#define QML_DEFINE_TYPE(URI, VERSION, NAME, TYPE) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(#URI, #VERSION, #NAME, #TYPE)); +#define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MIN_TO, NAME, TYPE) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(#URI, VERSION_MAJ, VERSION_MIN_FROM, VERSION_MIN_TO, #NAME, #TYPE)); #define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE)); |