diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 09:10:26 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 09:10:27 +0200 |
| commit | 68375b4f3dc9fef5412343ac4496a4af0db43839 (patch) | |
| tree | 019e4756c61bba7aead031eed2dc4f4fafd99294 /src/network | |
| parent | 22891dd897b37be03222ec4881629628fb312442 (diff) | |
| parent | 18aa8390ce83b4aa9cabe5609b8f830f86e475e5 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iadeca81f499d6b19e86ceae1edd7960db2575e90
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/configure.json | 12 | ||||
| -rw-r--r-- | src/network/kernel/qauthenticator.cpp | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index a1cb77b6d1..f501465c91 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -102,13 +102,23 @@ "gssapi": { "label": "KRB5 GSSAPI Support", "test": { + "head": [ + "#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))", + "# include <TargetConditionals.h>", + "# if defined(TARGET_OS_MAC) && TARGET_OS_MAC", + "# include <GSS/GSS.h>", + "# endif", + "#else", + "# include <gssapi/gssapi.h>", + "#endif" + ], "main": [ "gss_ctx_id_t ctx;", "gss_context_time(nullptr, ctx, nullptr);" ] }, - "headers": [ "gssapi/gssapi.h" ], "sources": [ + { "libs": "-framework GSS", "condition": "config.darwin" }, { "type": "pkgConfig", "args": "krb5-gssapi" }, "-lgssapi_krb5" ] diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index 4100dfd784..33a30eb1cd 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -59,8 +59,12 @@ #define SECURITY_WIN32 1 #include <security.h> #elif QT_CONFIG(gssapi) // GSSAPI +#if defined(Q_OS_DARWIN) +#include <GSS/GSS.h> +#else #include <gssapi/gssapi.h> -#endif +#endif // Q_OS_DARWIN +#endif // Q_CONFIG(sspi) QT_BEGIN_NAMESPACE |