diff --git a/src/core/config/common.pri b/src/core/config/common.pri index c41348f28434db00f258aff255ca4b79e271f163..bb318f1f051953e085517f7681e8e0dd9ce3db19 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -100,4 +100,10 @@ qtConfig(webengine-v8-snapshot) { gn_args += v8_use_snapshot=false } +qtConfig(webengine-kerberos) { + gn_args += use_kerberos=true +} else { + gn_args += use_kerberos=false +} + !msvc: gn_args += enable_iterator_debugging=false diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 8ffc276de00ce898b28dc647f4ef0159e6ba5d66..7f634472db6e64a49c37fe67f2de55c4e771349f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -5,7 +5,6 @@ gn_args += \ use_cups=false \ use_gio=false \ use_gnome_keyring=false \ - use_kerberos=false \ linux_use_bundled_binutils=false \ use_udev=true \ use_bundled_fontconfig=false \ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index e5e819e04dd6eb701b2dac9b767f864f3d6b86a2..4426901cf711afbef751faea9e103a2cc91bed28 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -24,7 +24,6 @@ system("$${QMAKE_CLANG_PATH} --version") gn_args += \ is_clang=true \ use_sysroot=false \ - use_kerberos=false \ clang_base_path=\"$${QMAKE_CLANG_DIR}\" \ clang_use_chrome_plugins=false \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 5aa511da3afcb97614f4105e247f1dd688ba0223..3b42a0b9a27e4c7641121a7d2dda38a4d1a893cf 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -3,7 +3,6 @@ include(common.pri) gn_args += \ is_clang=false \ use_sysroot=false \ - use_kerberos=true \ enable_session_service=false \ ninja_use_custom_environment_files=false \ is_multi_dll_chrome=false \ diff --git a/src/core/configure.json b/src/core/configure.json index 000faf686fc48493be3e6cf61fe7a35759abe10d..a72e6ca55d0f0961605eedb33e63defecd9b75ce 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -24,6 +24,7 @@ "webengine-geolocation": "boolean", "webengine-v8-snapshot": "boolean", "webengine-webchannel": "boolean", + "webengine-kerberos": "boolean", "alsa": { "type": "boolean", "name": "webengine-alsa" }, "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" }, "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, @@ -518,6 +519,13 @@ "autoDetect": false, "output": [ "privateFeature" ] }, + "webengine-kerberos": { + "label": "Kerberos Authentication", + "purpose": "Enables Kerberos Authentication Support", + "autoDetect": "config.win32", + "section": "WebEngine", + "output": [ "privateFeature" ] + }, "webengine-spellchecker": { "label": "Spellchecker", "purpose": "Provides a spellchecker.", @@ -695,6 +703,7 @@ "webengine-geolocation", "webengine-webchannel", "webengine-v8-snapshot", + "webengine-kerberos", { "type": "feature", "args": "webengine-v8-snapshot-support", diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index fdd9a881c580448b2fbd24e3978f5b8bb01c72b0..91ffef152fb76c2f8bbe7efd4a66737c576c6ed9 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -89,7 +89,7 @@ namespace QtWebEngineCore { static const char* const kDefaultAuthSchemes[] = { net::kBasicAuthScheme, net::kDigestAuthScheme, -#if defined(USE_KERBEROS) && !defined(OS_ANDROID) +#if QT_CONFIG(webengine_kerberos) net::kNegotiateAuthScheme, #endif net::kNtlmAuthScheme };