diff options
| -rw-r--r-- | src/gui/.prev_configure.cmake | 7 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 7 | ||||
| -rw-r--r-- | src/network/configure.cmake | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 298906fa53..e48fc36514 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -984,6 +984,13 @@ qt_feature("standarditemmodel" PUBLIC CONDITION QT_FEATURE_itemmodel ) qt_feature_definition("standarditemmodel" "QT_NO_STANDARDITEMMODEL" NEGATE VALUE "1") +qt_feature("filesystemmodel" PUBLIC + SECTION "File I/O" + LABEL "QFileSystemModel" + PURPOSE "Provides a data model for the local filesystem." + CONDITION QT_FEATURE_itemmodel +) +qt_feature_definition("filesystemmodel" "QT_NO_FILESYSTEMMODEL" NEGATE VALUE "1") qt_feature("imageformatplugin" PUBLIC SECTION "Images" LABEL "QImageIOPlugin" diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index c260bb86ad..81f4af598f 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -1047,6 +1047,13 @@ qt_feature("standarditemmodel" PUBLIC CONDITION QT_FEATURE_itemmodel ) qt_feature_definition("standarditemmodel" "QT_NO_STANDARDITEMMODEL" NEGATE VALUE "1") +qt_feature("filesystemmodel" PUBLIC + SECTION "File I/O" + LABEL "QFileSystemModel" + PURPOSE "Provides a data model for the local filesystem." + CONDITION QT_FEATURE_itemmodel +) +qt_feature_definition("filesystemmodel" "QT_NO_FILESYSTEMMODEL" NEGATE VALUE "1") qt_feature("imageformatplugin" PUBLIC SECTION "Images" LABEL "QImageIOPlugin" diff --git a/src/network/configure.cmake b/src/network/configure.cmake index e64a98415a..a6b98b6fad 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -428,7 +428,6 @@ qt_configure_add_summary_entry(ARGS "openssl-linked") qt_configure_add_summary_entry(ARGS "opensslv11") qt_configure_add_summary_entry(ARGS "dtls") qt_configure_add_summary_entry(ARGS "ocsp") -qt_configure_add_summary_entry(ARGS "ftp") qt_configure_add_summary_entry(ARGS "sctp") qt_configure_add_summary_entry(ARGS "system-proxies") qt_configure_add_summary_entry(ARGS "gssapi") @@ -437,7 +436,7 @@ qt_configure_end_summary_section() # end of "Qt Network" section qt_configure_add_report_entry( TYPE NOTE MESSAGE "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS. For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked" - CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND TEST_openssl.source NOT = 0 AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME + CONDITION NOT ANDROID AND QT_FEATURE_openssl_linked AND ( NOT TEST_openssl.source EQUAL 0 ) AND INPUT_openssl.prefix STREQUAL '' AND INPUT_openssl.libs STREQUAL '' AND INPUT_openssl.libs.debug STREQUAL '' OR FIXME ) qt_configure_add_report_entry( TYPE WARNING |