diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:01:47 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:01:48 +0200 |
commit | 3a1613c2276a30ccf101e7349d89611cf5d86e6a (patch) | |
tree | a58ca18e938b88bb0952cbcd3c70252ad2eb2ae0 /src/network | |
parent | 127ed7e6e0f8939861cce7349e28a1dec9a7d6ed (diff) | |
parent | a978d21dac57697ae9557b99062bc804b005b9d4 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I43393cf47675fd6c14972df1221986335c6f493c
Diffstat (limited to 'src/network')
-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 |
3 files changed, 17 insertions, 12 deletions
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 += \ |