diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:32 +0100 |
| commit | 3c5cef4fdec28ab4adfb24f75f2fd7f3fca7b3b0 (patch) | |
| tree | 7dfd894311ad904b50c35470f24479c5f5fa43ec /src/declarative/qml/qdeclarative.h | |
| parent | b35d793648a24b229aac75ea43d5a175967304ca (diff) | |
| parent | 14166395053bf93a561d87846d172515e5325882 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
Diffstat (limited to 'src/declarative/qml/qdeclarative.h')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 7168d4e4..dd08105e 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -49,10 +49,9 @@ #include <QtDeclarative/qdeclarativelist.h> #include <QtCore/qbytearray.h> +#include <QtCore/qurl.h> #include <QtCore/qmetaobject.h> -QT_BEGIN_HEADER - #define QML_DECLARE_TYPE(TYPE) \ Q_DECLARE_METATYPE(TYPE *) \ Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>) @@ -390,6 +389,19 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type); } +inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, int versionMinor, const char *qmlName) +{ + QDeclarativePrivate::RegisterComponent type = { + url, + uri, + qmlName, + versionMajor, + versionMinor + }; + + return QDeclarativePrivate::qmlregister(QDeclarativePrivate::ComponentRegistration, &type); +} + class QDeclarativeContext; class QDeclarativeEngine; Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); @@ -410,6 +422,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_HEADER - #endif // QDECLARATIVE_H |