diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
| commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
| tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/qmlmodels | |
| parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) | |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qmlmodels/configure.cmake | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index f0896e49fd..5bf34062d3 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -7,7 +7,7 @@ qt_add_module(QmlModels SOURCES qqmlchangeset.cpp qqmlchangeset_p.h - qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h + qqmlmodelsmodule_p.h qtqmlmodelsglobal.h qtqmlmodelsglobal_p.h DEFINES QT_NO_FOREACH @@ -21,6 +21,12 @@ qt_add_module(QmlModels Qt::Qml ) +#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models.2" +# QML_IMPORT_NAME = "QtQml.Models" + ## Scopes: ##################################################################### diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake index b1242a2aa1..44643c88a6 100644 --- a/src/qmlmodels/configure.cmake +++ b/src/qmlmodels/configure.cmake @@ -14,24 +14,24 @@ #### Features -qt_feature("qml_object_model" PRIVATE +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 +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 +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 +qt_feature("qml-table-model" PRIVATE SECTION "QML" LABEL "QML table model" PURPOSE "Provides the TableModel QML type." |