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/qdeclarativeprivate.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/qdeclarativeprivate.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeprivate.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index ab9fe415..05a457c3 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -56,8 +56,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -233,10 +231,19 @@ namespace QDeclarativePrivate AutoParentFunction function; }; + struct RegisterComponent { + const QUrl &url; + const char *uri; + const char *typeName; + int majorVersion; + int minorVersion; + }; + enum RegistrationType { TypeRegistration = 0, InterfaceRegistration = 1, - AutoParentRegistration = 2 + AutoParentRegistration = 2, + ComponentRegistration = 3 }; int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *); @@ -244,6 +251,4 @@ namespace QDeclarativePrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPRIVATE_H |