Merge remote-tracking branch 'origin/wip/cmake' into dev

Conflicts:
  dependencies.yaml

Change-Id: Ifff48b9d0e7962d481e63c49399e2d304e1011e5

2 files changed, 117 insertions, 0 deletions

diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
new file mode 100644
index 0000000000..069ea4a01e
--- /dev/null
+++ b/src/qmlmodels/CMakeLists.txt
@@ -0,0 +1,78 @@
+# Generated from qmlmodels.pro.
+
+#####################################################################
+## QmlModels Module:
+#####################################################################
+
+qt_add_module(QmlModels
+    GENERATE_METATYPES
+    SOURCES
+        qqmlchangeset.cpp qqmlchangeset_p.h
+        qqmlmodelsmodule_p.h
+        qtqmlmodelsglobal.h qtqmlmodelsglobal_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_INTEGER_EVENT_COORDINATES
+        QT_NO_URL_CAST_FROM_STRING
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::QmlPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Qml
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::QmlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>:
+# QMLTYPES_FILENAME = "plugins.qmltypes"
+# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models"
+# QML_IMPORT_NAME = "QtQml.Models"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
+    SOURCES
+        qqmlinstantiator.cpp qqmlinstantiator_p.h
+        qqmlinstantiator_p_p.h
+        qqmlobjectmodel.cpp qqmlobjectmodel_p.h
+)
+
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
+    SOURCES
+        qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h
+)
+
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
+    SOURCES
+        qqmllistmodel.cpp qqmllistmodel_p.h
+        qqmllistmodel_p_p.h
+        qqmllistmodelworkeragent.cpp qqmllistmodelworkeragent_p.h
+)
+
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
+    SOURCES
+        qqmlabstractdelegatecomponent.cpp qqmlabstractdelegatecomponent_p.h
+        qqmladaptormodel.cpp qqmladaptormodel_p.h
+        qqmldelegatemodel.cpp qqmldelegatemodel_p.h
+        qqmldelegatemodel_p_p.h
+        qqmllistaccessor.cpp qqmllistaccessor_p.h
+        qqmllistcompositor.cpp qqmllistcompositor_p.h
+        qquickpackage.cpp qquickpackage_p.h
+)
+qt_add_docs(QmlModels
+    doc/qtqmlmodels.qdocconf
+)
+
+
+set_target_properties(QmlModels PROPERTIES
+    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
+    QT_QML_MODULE_URI QtQml.Models
+    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models"
+)
+
+qt6_qml_type_registration(QmlModels)
diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake
new file mode 100644
index 0000000000..44643c88a6
--- /dev/null
+++ b/src/qmlmodels/configure.cmake
@@ -0,0 +1,39 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("qml-object-model" PRIVATE
+    SECTION "QML"
+    LABEL "QML object model"
+    PURPOSE "Provides the ObjectModel and Instantiator QML types."
+)
+qt_feature("qml-list-model" PRIVATE
+    SECTION "QML"
+    LABEL "QML list model"
+    PURPOSE "Provides the ListModel QML type."
+    CONDITION QT_FEATURE_qml_itemmodel
+)
+qt_feature("qml-delegate-model" PRIVATE
+    SECTION "QML"
+    LABEL "QML delegate model"
+    PURPOSE "Provides the DelegateModel QML type."
+    CONDITION QT_FEATURE_qml_object_model AND QT_FEATURE_qml_itemmodel
+)
+qt_feature("qml-table-model" PRIVATE
+    SECTION "QML"
+    LABEL "QML table model"
+    PURPOSE "Provides the TableModel QML type."
+    CONDITION QT_FEATURE_qml_itemmodel AND QT_FEATURE_qml_delegate_model
+)