diff options
| author | Alan Alpert <aalpert@rim.com> | 2012-12-23 22:57:10 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 10:32:55 +0100 |
| commit | 969dc839c3b0028e821d15015f99bd70d76fbc03 (patch) | |
| tree | 31169cef3a2f39e46ea5982856c559c3be37b3f6 /src/qml/qml/qqmlengine.cpp | |
| parent | f513e88403b66c4a5efe4c62c160dfce151efb33 (diff) | |
Add Instantiator type to QtQml
Provides a dynamic instantiation type which is not tied to visual items.
Change-Id: I42f7332b29b752dcc94979b6e0ec191fc76b96ef
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 96d01920d9..25ef080cb5 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -96,6 +96,7 @@ #include <private/qqmldelegatemodel_p.h> #include <private/qqmlobjectmodel_p.h> #include <private/qquickworkerscript_p.h> +#include <private/qqmlinstantiator_p.h> #ifdef Q_OS_WIN // for %APPDATA% #include <qt_windows.h> @@ -183,6 +184,7 @@ void QQmlEnginePrivate::registerBaseTypes(const char *uri, int versionMajor, int qmlRegisterType<QQmlBind>(uri, versionMajor, versionMinor,"Binding"); qmlRegisterType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections"); qmlRegisterType<QQmlTimer>(uri, versionMajor, versionMinor,"Timer"); + qmlRegisterType<QQmlInstantiator>(uri, versionMajor, (versionMinor < 1 ? 1 : versionMinor), "Instantiator"); //Only available in >=2.1 qmlRegisterCustomType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections", new QQmlConnectionsParser); qmlRegisterType<QQmlInstanceModel>(); } |