Merge branch '5.6' into dev

Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542

1 files changed, 3 insertions, 2 deletions

diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index b9162f9b9..2d75b2383 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -382,8 +382,9 @@ void UIDelegatesManager::showDialog(QSharedPointer<AuthenticationDialogControlle
         introMessage = tr("Connect to proxy \"%1\" using:");
         introMessage = introMessage.arg(dialogController->host().toHtmlEscaped());
     } else {
-        introMessage = tr("Enter username and password for \"%1\" at %2");
-        introMessage = introMessage.arg(dialogController->realm()).arg(dialogController->url().toString().toHtmlEscaped());
+        const QUrl url = dialogController->url();
+        introMessage = tr("Enter username and password for \"%1\" at %2://%3");
+        introMessage = introMessage.arg(dialogController->realm(), url.scheme(), url.host());
     }
     QQmlProperty textProp(authenticationDialog, QStringLiteral("text"));
     textProp.write(introMessage);