From 1b4dd753eda1111767d81df3bb665f2b14a65d8e Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Tue, 11 Feb 2020 12:28:35 +0100 Subject: Disable FTP support in QNAM by default If necessary, the feature still can be enabled with -feature-ftp. Task-number: QTBUG-80339 Change-Id: I7dafaad254d1396f24ac5c339d55c3bedfa97f1c Reviewed-by: Alexandru Croitor Reviewed-by: Karsten Heimrich --- src/network/configure.cmake | 1 + src/network/configure.json | 2 ++ 2 files changed, 3 insertions(+) (limited to 'src') diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 9046464cf4..2f26396524 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -274,6 +274,7 @@ qt_feature("ftp" PUBLIC SECTION "Networking" LABEL "FTP" PURPOSE "Provides support for the File Transfer Protocol in QNetworkAccessManager." + AUTODETECT OFF CONDITION QT_FEATURE_textdate ) qt_feature_definition("ftp" "QT_NO_FTP" NEGATE VALUE "1") diff --git a/src/network/configure.json b/src/network/configure.json index 1f1e6fafbf..b56f2aded6 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -343,6 +343,7 @@ "label": "FTP", "purpose": "Provides support for the File Transfer Protocol in QNetworkAccessManager.", "section": "Networking", + "autoDetect": false, "condition": "features.textdate", "output": [ "publicFeature", "feature" ] }, @@ -480,6 +481,7 @@ For example: "opensslv11", "dtls", "ocsp", + "ftp", "sctp", "system-proxies", "gssapi" -- cgit v1.2.3