diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-16 07:34:46 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-16 07:34:46 (GMT) |
| commit | e337d74c2be957d356216b01c93299a2992a128b (patch) | |
| tree | b59a36b81abe911a0ceaf19a7e2a84503c479041 /src/declarative/qml/qml.h | |
| parent | bcae9d84fb5dd2bdc5a5298c8841702505a02867 (diff) | |
| download | Qt-e337d74c2be957d356216b01c93299a2992a128b.zip Qt-e337d74c2be957d356216b01c93299a2992a128b.tar.gz Qt-e337d74c2be957d356216b01c93299a2992a128b.tar.bz2 | |
Qualifiers and versioning for C++-defined types.
(and a *TEST* hack for Qt/4.6/ - this is exactly NOT the way to do it)
Two-step type resolution for Javascript (Aaron).
Diffstat (limited to 'src/declarative/qml/qml.h')
| -rw-r--r-- | src/declarative/qml/qml.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index cd01f6a..d43e693 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -73,14 +73,17 @@ 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>(#NAME, #TYPE)); + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(QML_FORCE_NAMESPACE #NAME, #TYPE)); #define QML_DEFINE_TYPE(TYPE, NAME) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(#NAME, #TYPE)); + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(QML_FORCE_NAMESPACE #NAME, #TYPE)); #define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE)); |