summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-01-15 13:17:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-01-22 10:49:32 +0100
commit91b3a9c056af7e08aca49d8dc2393d23fe6acf85 (patch)
treece6dd8159b901c1ddd58b32a379f6a78b0720daf
parent75d061bbc68875c08b3dc243e464e32a80da71df (diff)
Support devtools close button
Change-Id: Icad495c3bf144a4da53b2a60585dabb3fc36d3d6 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
-rw-r--r--examples/webenginewidgets/simplebrowser/tabwidget.cpp4
-rw-r--r--src/core/devtools_frontend_qt.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
index d7a69e61f..10ccdad59 100644
--- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
@@ -196,7 +196,9 @@ void TabWidget::setupView(WebView *webView)
});
connect(webPage, &QWebEnginePage::windowCloseRequested, [this, webView]() {
int index = indexOf(webView);
- if (index >= 0)
+ if (webView->page()->inspectedPage())
+ window()->close();
+ else if (index >= 0)
closeTab(index);
});
connect(webView, &WebView::devToolsRequested, this, &TabWidget::devToolsRequested);
diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp
index 028f5f0d3..71d51190a 100644
--- a/src/core/devtools_frontend_qt.cpp
+++ b/src/core/devtools_frontend_qt.cpp
@@ -529,6 +529,8 @@ void DevToolsFrontendQt::HandleMessageFromDevToolsFrontend(const std::string &me
return;
} else if (method == "bringToFront") {
Activate();
+ } else if (method == "closeWindow") {
+ web_contents()->Close();
} else {
VLOG(1) << "Unimplemented devtools method: " << message;
return;