diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-05-26 21:57:33 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-05-27 14:50:43 +0200 |
commit | 061c8adf127035dbfca39f2ce617e4e01afa8fed (patch) | |
tree | 0da70e92eed26ca6d1eceead0e097a519ceb1914 | |
parent | b239ad1ac5a9a8fc0404d330850849930c97aec6 (diff) |
Fix generating webrtc logging resources with cmake
Also disable webrtc logging test if extensions are disabled.
Change-Id: I49c8d4fb6049c9aed174f62f731b0f56dae490ba
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/configure/BUILD.root.gn.in | 9 | ||||
-rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in index 77d07f451..b341f067a 100644 --- a/src/core/configure/BUILD.root.gn.in +++ b/src/core/configure/BUILD.root.gn.in @@ -297,7 +297,6 @@ source_set("qtwebengine_sources") { if (enable_webrtc && enable_extensions) { deps += [ - "//chrome/browser/resources/media:webrtc_logs_resources", "//components/upload_list", "//components/webrtc_logging/browser", "//components/webrtc_logging/common", @@ -426,6 +425,14 @@ repack("qtwebengine_repack_resources") { "//content/browser/webrtc/resources", ] } + if (enable_webrtc && enable_extensions) { + sources += [ + "$root_gen_dir/chrome/webrtc_logs_resources.pak", + ] + deps += [ + "//chrome/browser/resources/media:webrtc_logs_resources", + ] + } } repack("qtwebengine_repack_resources_100") { diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 2673c0d33..432a91224 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -3198,8 +3198,10 @@ void tst_QWebEngineView::webUIURLs_data() QTest::newRow("version") << QUrl("chrome://version") << false; #if QT_CONFIG(webengine_webrtc) QTest::newRow("webrtc-internals") << QUrl("chrome://webrtc-internals") << true; +#if QT_CONFIG(webengine_extensions) QTest::newRow("webrtc-logs") << QUrl("chrome://webrtc-logs") << true; -#endif +#endif // QT_CONFIG(webengine_extensions) +#endif // QT_CONFIG(webengine_webrtc) } void tst_QWebEngineView::webUIURLs() |