diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-09 15:16:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-12 13:12:12 +0000 |
| commit | 5f3190f575bd33f67a3bbd8936fa364cf651cd6f (patch) | |
| tree | 0fa442b7afd002face097d682d1ba7d8cc1ae0f7 | |
| parent | 3344194b9503ebc8f6b21cbfb39c89624facc0e7 (diff) | |
Fix mojo-based WebUI
We were lacking the mojo_bindings.js resource.
Change-Id: I7afa4dc101fb9dfd7e28e17ccb7f3edef0a5566b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| -rw-r--r-- | src/core/qtwebengine_resources.gni | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/qtwebengine_resources.gni b/src/core/qtwebengine_resources.gni index 0e3652c1d..6e8c3c6eb 100644 --- a/src/core/qtwebengine_resources.gni +++ b/src/core/qtwebengine_resources.gni @@ -21,6 +21,7 @@ repack("qtwebengine_repack_resources") { "$root_gen_dir/chrome/task_scheduler_internals_resources.pak", "$root_gen_dir/components/components_resources.pak", "$root_gen_dir/content/content_resources.pak", + "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", "$root_gen_dir/net/net_resources.pak", "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak", @@ -32,6 +33,7 @@ repack("qtwebengine_repack_resources") { "//chrome/browser/resources:task_scheduler_internals_resources", "//components/resources:components_resources_grit", "//content:resources_grit", + "//mojo/public/js:resources", "//net:net_resources_grit", "//third_party/blink/public:resources_grit", "//ui/resources:webui_resources_grd_grit", diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 78677e459..92e281873 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -2811,6 +2811,7 @@ void tst_QWebEngineView::webUIURLs_data() QTest::newRow("policy") << QUrl("chrome://policy") << false; QTest::newRow("predictors") << QUrl("chrome://predictors") << false; QTest::newRow("print") << QUrl("chrome://print") << false; + QTest::newRow("process-internals") << QUrl("chrome://process-internals") << true; QTest::newRow("profiler") << QUrl("chrome://profiler") << false; QTest::newRow("quota-internals") << QUrl("chrome://quota-internals") << true; QTest::newRow("safe-browsing") << QUrl("chrome://safe-browsing") << false; |