1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rerun configurejson2cmake after rebase on top of newer dev

Browse Source 
Change-Id: I1af79e5c87bb17e9145f817d2488c6d24531a2fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tobias Hunger 2018-10-29 17:08:36 +01:00
parent 6ae0821a09
commit 6456d9e14a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.cmake
View File

@ -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"

7
src/corelib/configure.cmake
View File

@ -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"

2
src/widgets/configure.cmake
View File

@ -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