QAuthenticator - use GSS framework, as Apple requires
since declarations in gssapi.h are marked as deprecated. Fixes: QTBUG-78810 Change-Id: I241ae4913f362f6e9219438e9bfe7a63dfc91b7c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>bb10
parent
9115c7ae45
commit
b7a915398a
|
|
@ -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"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
|
|
@ -59,8 +60,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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue