diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-10-29 17:08:36 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-01 11:49:12 +0000 |
| commit | 6456d9e14a2f36694111c0aae774435a9647940f (patch) | |
| tree | b7a2cf598c6ab14d43861d84c136ed4193a09db8 | |
| parent | 6ae0821a090ddd68437e0ffe01aab97b86b1ae19 (diff) | |
Rerun configurejson2cmake after rebase on top of newer dev
Change-Id: I1af79e5c87bb17e9145f817d2488c6d24531a2fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | configure.cmake | 1 | ||||
| -rw-r--r-- | src/corelib/configure.cmake | 7 | ||||
| -rw-r--r-- | src/widgets/configure.cmake | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 0fe4129962..dc9fed82fe 100644 --- a/configure.cmake +++ b/configure.cmake @@ -392,7 +392,6 @@ qt_feature("gui" PRIVATE ) qt_feature("network" PRIVATE LABEL "Qt Network" - CONDITION QT_FEATURE_thread ) qt_feature("sql" PRIVATE LABEL "Qt Sql" diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 21886b06aa..7836577e5c 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -614,6 +614,13 @@ qt_feature("identityproxymodel" PUBLIC CONDITION QT_FEATURE_proxymodel ) qt_feature_definition("identityproxymodel" "QT_NO_IDENTITYPROXYMODEL" NEGATE VALUE "1") +qt_feature("concatenatetablesproxymodel" PUBLIC + SECTION "ItemViews" + LABEL "QConcatenateTablesProxyModel" + PURPOSE "Supports concatenating source models." + CONDITION QT_FEATURE_proxymodel +) +qt_feature_definition("concatenatetablesproxymodel" "QT_NO_CONCATENATETABLESPROXYMODEL" NEGATE VALUE "1") qt_feature("stringlistmodel" PUBLIC SECTION "ItemViews" LABEL "QStringListModel" diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index 3fae04b0d2..2c828a6711 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -53,7 +53,7 @@ qt_feature("filesystemmodel" PUBLIC SECTION "File I/O" LABEL "QFileSystemModel" PURPOSE "Provides a data model for the local filesystem." - CONDITION QT_FEATURE_itemmodel AND QT_FEATURE_thread + CONDITION QT_FEATURE_itemmodel ) qt_feature_definition("filesystemmodel" "QT_NO_FILESYSTEMMODEL" NEGATE VALUE "1") qt_feature("itemviews" PUBLIC |