diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:15:14 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 00:15:14 (GMT) |
| commit | dc602e3b9c4d5e4da1d57ed657d82e73401b4531 (patch) | |
| tree | 6f1ec1972a6dbeea0830373fe534390da06e6869 /src/declarative/qml/qml.h | |
| parent | 8dc527a3837c937630c8bbbab034b8bc84d496fb (diff) | |
| download | Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.zip Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.tar.gz Qt-dc602e3b9c4d5e4da1d57ed657d82e73401b4531.tar.bz2 | |
Move all QML types to Qt/4.6 namespace.
Adjust examples and demos accordingly.
As per QT-558
Diffstat (limited to 'src/declarative/qml/qml.h')
| -rw-r--r-- | src/declarative/qml/qml.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index d43e693..5dd57bc 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -73,17 +73,14 @@ QT_MODULE(Declarative) QT_BEGIN_NAMESPACE -//#define QML_FORCE_NAMESPACE "Qt/4.6/" -#define QML_FORCE_NAMESPACE - #define QML_DEFINE_INTERFACE(INTERFACE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); -#define QML_DEFINE_EXTENDED_TYPE(TYPE, NAME, EXTENSION) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(QML_FORCE_NAMESPACE #NAME, #TYPE)); +#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_TYPE(TYPE, NAME) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(QML_FORCE_NAMESPACE #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_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE)); |