Fix QML type registration for some types

* QIfAbstractZonedFeature was registered with the wrong name
* QIfAbstractFeatureListModel wasn't registered at all

Change-Id: I0fed94fd2fcf1b1ef231d3a33991224db4f7aed4
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 02e60a9a9a2904470025701d92a97b228bb7da0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 4 insertions, 1 deletions

diff --git a/src/interfaceframework/qifabstractfeaturelistmodel.h b/src/interfaceframework/qifabstractfeaturelistmodel.h
index 65449cfa..4becef7c 100644
--- a/src/interfaceframework/qifabstractfeaturelistmodel.h
+++ b/src/interfaceframework/qifabstractfeaturelistmodel.h
@@ -17,6 +17,8 @@ class QIfAbstractFeatureListModelPrivate;
 class Q_QTINTERFACEFRAMEWORK_EXPORT QIfAbstractFeatureListModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(AbstractFeatureListModel)
+    QML_UNCREATABLE("")
     Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(QIfAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
diff --git a/src/interfaceframework/qifabstractzonedfeature.h b/src/interfaceframework/qifabstractzonedfeature.h
index 1e504154..e2be92dc 100644
--- a/src/interfaceframework/qifabstractzonedfeature.h
+++ b/src/interfaceframework/qifabstractzonedfeature.h
@@ -19,7 +19,7 @@ class QIfAbstractZonedFeaturePrivate;
 class Q_QTINTERFACEFRAMEWORK_EXPORT QIfAbstractZonedFeature : public QIfAbstractFeature
 {
     Q_OBJECT
-    QML_NAMED_ELEMENT(QIfAbstractZonedFeature)
+    QML_NAMED_ELEMENT(AbstractZonedFeature)
     QML_UNCREATABLE("")
 
     Q_PROPERTY(QString zone READ zone WRITE setZone NOTIFY zoneChanged)
diff --git a/src/interfaceframework/qtinterfaceframeworkmodule.cpp b/src/interfaceframework/qtinterfaceframeworkmodule.cpp
index 496927f8..85dfc8d8 100644
--- a/src/interfaceframework/qtinterfaceframeworkmodule.cpp
+++ b/src/interfaceframework/qtinterfaceframeworkmodule.cpp
@@ -128,6 +128,7 @@ void QtInterfaceFrameworkModule::registerQmlTypes(const QString &uri, int majorV
     qmlRegisterSingletonType<QtInterfaceFrameworkModule>(u, majorVersion, minorVersion,
                                         "QtInterfaceFrameworkModule",
                                         qtinterfaceframeworkmodule_singletontype_provider);
+    qmlRegisterUncreatableType<QIfAbstractFeatureListModel>(u, majorVersion, minorVersion, "AbstractFeatureListModel", QStringLiteral("AbstractFeatureListModel is not accessible directly"));
     qmlRegisterUncreatableType<QIfAbstractFeature>(u, majorVersion, minorVersion, "AbstractFeature", QStringLiteral("AbstractFeature is not accessible directly"));
     qmlRegisterUncreatableType<QIfAbstractZonedFeature>(u, majorVersion, minorVersion, "AbstractZonedFeature", QStringLiteral("AbstractZonedFeature is not accessible directly"));
     qmlRegisterType<QIfPagingModel>(u, majorVersion, minorVersion, "PagingModel");