diff --git a/configure.cmake b/configure.cmake index 0fe41299626..dc9fed82fe3 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 21886b06aaa..7836577e5ce 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 3fae04b0d21..2c828a67114 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