diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-10-03 09:04:52 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-10-03 15:16:42 +0000 |
| commit | cf24651b550752fbf9bd3afb02aee5d722164658 (patch) | |
| tree | 11e1a7b9badace904ad55098ab5d97ffbc74f426 /src/qml/qml | |
| parent | 347a29ff5cc2bde63863cf8657c64b4d13f52406 (diff) | |
Remove obsolete VisualDataModel, *Group and VisualItemModel in Qt 6
VisualDataModel, VisualDataGroup, and VisualItemModel
are replaced with DelegateModel, DelegateModelGroup, and ObjectModel
respectively (since 7cad0e52c5a020bd29635e9912fd8946a6b48124).
In Qt 6 they will be removed.
Change-Id: Ia54bb7a2f9b97b7a8115a0f0bab63a08eca59fc0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/qml/qml')
| -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 a100e1adc3..f288646ec7 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -249,11 +249,13 @@ void QQmlEnginePrivate::registerQtQuick2Types(const char *uri, int versionMajor, qmlRegisterType<QQuickWorkerScript>(uri, versionMajor, versionMinor, "WorkerScript"); #endif qmlRegisterType<QQuickPackage>(uri, versionMajor, versionMinor, "Package"); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_CONFIG(qml_delegate_model) qmlRegisterType<QQmlDelegateModel>(uri, versionMajor, versionMinor, "VisualDataModel"); qmlRegisterType<QQmlDelegateModelGroup>(uri, versionMajor, versionMinor, "VisualDataGroup"); #endif qmlRegisterType<QQmlObjectModel>(uri, versionMajor, versionMinor, "VisualItemModel"); +#endif // < Qt 6 } void QQmlEnginePrivate::defineQtQuick2Module() |