diff options
| author | Alan Alpert <aalpert@rim.com> | 2013-01-23 14:08:58 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 23:25:48 +0100 |
| commit | 700910d938c75c978f765ec8438f81e70676999a (patch) | |
| tree | 37a8397a13e3217db8140acf85644c8df452aca9 /src/qml/qml/qqmlengine.cpp | |
| parent | fa8a4beb157f82e02cf8471ade7da0faee7a9fa1 (diff) | |
Add QtQml.Models module
The moved Model classes can now be exposed in a QtQml import.
To keep the QtQml import resticted to more core functionality, they are
being exposed in a plugin module.
Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29
Reviewed-by: Alan Alpert <aalpert@blackberry.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 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index ddc6f0e9b9..5bb9ac7df6 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -55,7 +55,6 @@ #include "qqmlxmlhttprequest_p.h" #include "qqmlscriptstring.h" #include "qqmlglobal_p.h" -#include "qqmllistmodel_p.h" #include "qquickworkerscript_p.h" #include "qqmlcomponent_p.h" #include "qqmlnetworkaccessmanagerfactory.h" @@ -89,10 +88,11 @@ #include <private/qqmllocale_p.h> -#include "qqmlbind_p.h" -#include "qqmlconnections_p.h" -#include "qqmltimer_p.h" -#include "qqmlplatform_p.h" +#include <private/qqmlbind_p.h> +#include <private/qqmlconnections_p.h> +#include <private/qqmltimer_p.h> +#include <private/qqmllistmodel_p.h> +#include <private/qqmlplatform_p.h> #include <private/qquickpackage_p.h> #include <private/qqmldelegatemodel_p.h> #include <private/qqmlobjectmodel_p.h> @@ -184,20 +184,20 @@ void QQmlEnginePrivate::registerBaseTypes(const char *uri, int versionMajor, int qmlRegisterType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections"); qmlRegisterType<QQmlTimer>(uri, versionMajor, versionMinor,"Timer"); qmlRegisterCustomType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections", new QQmlConnectionsParser); - qmlRegisterType<QQmlListElement>(uri, versionMajor, versionMinor, "ListElement"); - qmlRegisterCustomType<QQmlListModel>(uri, versionMajor, versionMinor, "ListModel", new QQmlListModelParser); + qmlRegisterType<QQmlInstanceModel>(); } // These QtQuick types' implementation resides in the QtQml module void QQmlEnginePrivate::registerQtQuick2Types(const char *uri, int versionMajor, int versionMinor) { + qmlRegisterType<QQmlListElement>(uri, versionMajor, versionMinor, "ListElement"); // Now in QtQml.Models, here for compatibility + qmlRegisterCustomType<QQmlListModel>(uri, versionMajor, versionMinor, "ListModel", new QQmlListModelParser); // Now in QtQml.Models, here for compatibility qmlRegisterType<QQuickWorkerScript>(uri, versionMajor, versionMinor, "WorkerScript"); qmlRegisterType<QQuickPackage>(uri, versionMajor, versionMinor, "Package"); qmlRegisterType<QQmlDelegateModel>(uri, versionMajor, versionMinor, "VisualDataModel"); - qmlRegisterType<QQmlDataGroup>(uri, versionMajor, versionMinor, "VisualDataGroup"); + qmlRegisterType<QQmlDelegateModelGroup>(uri, versionMajor, versionMinor, "VisualDataGroup"); qmlRegisterType<QQmlObjectModel>(uri, versionMajor, versionMinor, "VisualItemModel"); - qmlRegisterType<QQmlInstanceModel>(); } void QQmlEnginePrivate::defineQtQuick2Module() |