diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 18:33:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:42 +0000 |
| commit | 30917cd20ce1e40482e967fdafb5f8b95a62b640 (patch) | |
| tree | 090589f0c9984fc5a0715844fdfa7b993551bab6 /src/qmlmodels | |
| parent | c2f8b9535d34da6948ccf45b7d5fd90de2f1bc9e (diff) | |
Regenerate required projects after dev -> wip/cmake merge
Change-Id: Ic5f1909731ec11b4fb6bc8823506d272c529ecfb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qmlmodels/configure.cmake | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index bbfedc60e6..4b6ea4e392 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -58,3 +58,7 @@ extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model qqmllistcompositor.cpp qqmllistcompositor_p.h qquickpackage.cpp qquickpackage_p.h ) +add_qt_docs(QmlModels + doc/qtqmlmodels.qdocconf +) + diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake index 43c3ac8aab..b1242a2aa1 100644 --- a/src/qmlmodels/configure.cmake +++ b/src/qmlmodels/configure.cmake @@ -35,5 +35,5 @@ qt_feature("qml_table_model" PRIVATE SECTION "QML" LABEL "QML table model" PURPOSE "Provides the TableModel QML type." - CONDITION QT_FEATURE_qml_itemmodel + CONDITION QT_FEATURE_qml_itemmodel AND QT_FEATURE_qml_delegate_model ) |