summaryrefslogtreecommitdiffstats
path: root/src/network/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/configure.json')
-rw-r--r--src/network/configure.json18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index d3e5009f45..d6be41128a 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" ]
},
@@ -430,6 +431,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 +453,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 +487,7 @@ For example:
"opensslv11",
"dtls",
"ocsp",
+ "ftp",
"sctp",
"system-proxies",
"gssapi"