diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 2 | ||||
| -rw-r--r-- | src/network/configure.json | 25 | ||||
| -rw-r--r-- | src/network/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/network/network.pro | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index af1e0b7278..1deaa03f71 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -318,7 +318,7 @@ QT_BEGIN_NAMESPACE server supports HTTP/2. The attribute works with SSL or 'cleartext' HTTP/2. If a server turns out to not support HTTP/2, when HTTP/2 direct was specified, QNetworkAccessManager gives up, without attempting to - fall back to HTTP/1.1. If both HTTP2AllowedAttribute and + fall back to HTTP/1.1. If both Http2AllowedAttribute and Http2DirectAttribute are set, Http2DirectAttribute takes priority. (This value was introduced in 5.11.) diff --git a/src/network/configure.json b/src/network/configure.json index bebe592088..a1cb77b6d1 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -98,6 +98,20 @@ "condition": "!config.msvc" } ] + }, + "gssapi": { + "label": "KRB5 GSSAPI Support", + "test": { + "main": [ + "gss_ctx_id_t ctx;", + "gss_context_time(nullptr, ctx, nullptr);" + ] + }, + "headers": [ "gssapi/gssapi.h" ], + "sources": [ + { "type": "pkgConfig", "args": "krb5-gssapi" }, + "-lgssapi_krb5" + ] } }, @@ -200,15 +214,6 @@ }, "use": "openssl" }, - "gssapi": { - "label": "KRB5 GSSAPI support", - "type": "compile", - "test": { - "include": [ "gssapi/gssapi.h" ], - "main": ["gss_ctx_id_t ctx;"], - "qmake": "LIBS += -lgssapi_krb5" - } - }, "netlistmgr": { "label": "Network List Manager", "type": "compile", @@ -408,7 +413,7 @@ "label": "GSSAPI", "purpose": "Enable SPNEGO authentication through GSSAPI", "section": "Networking", - "condition": "!config.win32 && tests.gssapi", + "condition": "!config.win32 && libs.gssapi", "output": [ "publicFeature", "feature" ] }, "sspi": { diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index a55648dbc7..110d9f56bf 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -83,7 +83,7 @@ macos | ios { SOURCES += kernel/qnetconmonitor_stub.cpp } -qtConfig(gssapi): LIBS_PRIVATE += -lgssapi_krb5 +qtConfig(gssapi): QMAKE_USE_PRIVATE += gssapi uikit:HEADERS += kernel/qnetworkinterface_uikit_p.h osx:SOURCES += kernel/qnetworkproxy_mac.cpp diff --git a/src/network/network.pro b/src/network/network.pro index 9082439f1c..d8453e879c 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -26,7 +26,7 @@ qtConfig(bearermanagement) { ANDROID_BUNDLED_JAR_DEPENDENCIES = \ jar/QtAndroidBearer.jar ANDROID_LIB_DEPENDENCIES = \ - plugins/bearer/libqandroidbearer.so + plugins/bearer/libplugins_bearer_qandroidbearer.so MODULE_PLUGIN_TYPES = \ bearer ANDROID_PERMISSIONS += \ |