Merge remote-tracking branch 'origin/5.11' into 5.12

Conflicts:
	configure.json
	src/3rdparty
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h
	src/core/login_delegate_qt.cpp
	src/core/login_delegate_qt.h
	src/core/net/url_request_context_getter_qt.cpp
	src/core/net/url_request_context_getter_qt.h
	src/core/qtwebengine.gni

3rdparty changes:
        616a7f558c7e This is expected for us, so don't report it as an error.
        c30febceaa1b Do not write <protocol>.json to source directory
        9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's
        e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error.
        f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts
        f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used
        5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium
        34f52ec3bae8 Bump maximum number of custom isolated world ids
        f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check
        1e80090f7044 Fix resolve_proxy service permissions
        2e498629651d Add proxy_resolver_manifest

Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b

1 files changed, 1 insertions, 0 deletions

diff --git a/src/core/login_delegate_qt.cpp b/src/core/login_delegate_qt.cpp
index 6dd2aa5ed..0bde12811 100644
--- a/src/core/login_delegate_qt.cpp
+++ b/src/core/login_delegate_qt.cpp
@@ -83,6 +83,7 @@ LoginDelegateQt::~LoginDelegateQt()
 void LoginDelegateQt::OnRequestCancelled()
 {
     destroy();
+    // TODO: this should close native dialog, since page can be navigated somewhere else
 }
 
 QUrl LoginDelegateQt::url() const