diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
| commit | 61fcaa0e659e1bc676e0ce4124d49aaae565b26c (patch) | |
| tree | e7071373a429da340e62bb7cfea0acb7029b63b4 /src/declarative/qml/qml.h | |
| parent | 9681d2190541c63a39b2cfe70dc3aaa161ebe703 (diff) | |
| download | Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.zip Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.gz Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.bz2 | |
Support compile-in-namespace for the declarative module.
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 51ca612..1990b7f 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -54,8 +54,6 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - QT_MODULE(Declarative) #define QML_DECLARE_TYPE(TYPE) \ @@ -73,6 +71,8 @@ QT_MODULE(Declarative) #define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \ QML_DECLARE_TYPE_HASMETATYPE(INTERFACE) +QT_BEGIN_NAMESPACE + #define QML_DEFINE_INTERFACE(INTERFACE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); @@ -110,11 +110,11 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj) return qmlAttachedPropertiesObjectById(idx, obj); } +QT_END_NAMESPACE + QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_NAMESPACE - QT_END_HEADER #endif // QML_H |