diff options
Diffstat (limited to 'src/network/configure.json')
| -rw-r--r-- | src/network/configure.json | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 289d84fbb4..254a36d725 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -343,7 +343,8 @@ "label": "FTP", "purpose": "Provides support for the File Transfer Protocol in QNetworkAccessManager.", "section": "Networking", - "condition": "features.textdate", + "autoDetect": false, + "condition": "features.textdate && features.regularexpression", "output": [ "publicFeature", "feature" ] }, "http": { @@ -386,17 +387,6 @@ "condition": "features.temporaryfile", "output": [ "publicFeature", "feature" ] }, - "bearermanagement": { - "label": "Bearer management (deprecated)", - "purpose": "Provides bearer management for the network stack.", - "section": "Networking", - "condition": "features.thread && features.library && features.networkinterface && features.properties", - "output": [ - "publicFeature", - "feature", - { "type": "define", "negative": true, "name": "QT_NO_BEARERMANAGEMENT" } - ] - }, "localserver": { "label": "QLocalServer", "purpose": "Provides a local socket based server.", @@ -430,6 +420,12 @@ "section": "Networking", "condition": "config.win32 && tests.netlistmgr", "output": [ "privateFeature" ] + }, + "topleveldomain": { + "label": "qTopLevelDomain()", + "purpose": "Provides support for extracting the top level domain from URLs. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.", + "section": "Networking", + "output": [ "publicFeature" ] } }, @@ -446,15 +442,7 @@ For example: { "type": "warning", "condition": "features.libproxy && input.qt_namespace == ''", - "message": "Some of libproxy's plugins may use incompatible Qt versions. - - Some platforms and distributions ship libproxy with plugins, such - as config_kde4.so, that are linked against old versions of Qt; and - libproxy loads these plugins automatically when initialized. If Qt - is not in a namespace, that loading causes a crash. Even if the - systems on which you build and test have no such plugins, your - users' systems may have them. We therefore recommend that you - combine -libproxy with -qtnamespace when configuring Qt." + "message": "Some of libproxy's plugins may use incompatible Qt versions. Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt; and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt." } ], @@ -488,6 +476,7 @@ For example: "opensslv11", "dtls", "ocsp", + "ftp", "sctp", "system-proxies", "gssapi" |