summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-03-01 14:55:01 +0100
committerKai Koehne <kai.koehne@qt.io>2018-03-08 14:41:10 +0000
commita03fb5fc7ac03c35739324d63eb29da756e1e908 (patch)
tree85fe63d86d1ffcb37cbb937c02579040b72e6a3a /examples
parent349d11dd83578b5baeec87e41c71f612e5bd21b3 (diff)
Rename protocol() to scheme() in QWERPHPermissionRequest
Scheme refers to a part of a URL. Protocol refers to a formal standard for communication over a network. Therefore scheme is more accurate here, since registerProtocolHandler only defines simple aliases. Change-Id: I71a1511aa92e41c3e3aca4c0403f54af6d91c563 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/webengine/quicknanobrowser/BrowserWindow.qml2
-rw-r--r--examples/webenginewidgets/simplebrowser/webpage.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml
index 15a8d96fe..55a35d611 100644
--- a/examples/webengine/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml
@@ -446,7 +446,7 @@ ApplicationWindow {
}
onRegisterProtocolHandlerPermissionRequested: {
- print("accepting registerProtocolHandler permission request for " + request.protocol + " from " + request.origin);
+ print("accepting registerProtocolHandler permission request for " + request.scheme + " from " + request.origin);
request.accept();
}
diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
index ef55fd33d..48a9d86b9 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
@@ -151,7 +151,7 @@ void WebPage::handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegiste
tr("Permission Request"),
tr("Allow %1 to open all %2 links?")
.arg(request.origin().host())
- .arg(request.protocol()));
+ .arg(request.scheme()));
if (answer == QMessageBox::Yes)
request.accept();
else