diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-18 16:56:06 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-18 16:56:06 +0100 |
commit | 440fbed83646f16bf002749f7cecf6ad6fc59bbf (patch) | |
tree | 231874f011a96d23061822d97bf70f52fc23617d /src/webengine/ui_delegates_manager.cpp | |
parent | bc315ce05298cf500f45f3a897b0f7c0408fd611 (diff) | |
parent | c506d1d867f827dbff405d8e789ab4810410079a (diff) |
Merge branch '5.6' into dev
Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
Diffstat (limited to 'src/webengine/ui_delegates_manager.cpp')
-rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 5 |
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); |