diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-08 15:12:42 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-26 17:12:25 +0000 |
| commit | a4cfac9a64273aa2c00e10c56ec40999fe778d7c (patch) | |
| tree | 471e3542915e8d214d0262d267d85e5cfdc615b8 | |
| parent | a190ba6685c974e5471598f7dfaac2c8d8631da3 (diff) | |
Reestablish default config for embedded builds
Was missing from the CMake switch-over
Change-Id: I0171d395f9e66c072e368b7019539fc29ff865b8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0def03920e07d6a2e193cbd2537643d668bc979a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/configure/BUILD.root.gn.in | 11 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebengineview/BLACKLIST | 3 |
4 files changed, 21 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2fa07d446..7b21fe459 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -361,6 +361,10 @@ foreach(arch ${archs}) ARGS use_browser_spellchecker CONDITION QT_FEATURE_webengine_native_spellchecker ) + extend_gn_list(gnArgArg + ARGS use_embedded_config + CONDITION QT_FEATURE_webengine_embedded_build + ) if(LINUX) list(APPEND gnArgArg diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in index 24e8563eb..08faf24d5 100644 --- a/src/core/configure/BUILD.root.gn.in +++ b/src/core/configure/BUILD.root.gn.in @@ -78,6 +78,14 @@ config("QtWebEngineCore_config") { ] } +declare_args() { + use_embedded_config = false +} + +config("embedded_config") { + defines = [ "QTWEBENGINE_EMBEDDED_SWITCHES=1" ] +} + config("cpp17_config") { # static initialized constexpr expressions must be compiled always as c++14 or always as c++17 # and our qtwebengine core sources use them as c++17 @@ -154,6 +162,9 @@ shared_library("QtWebEngineCore") { configs += [ "//build/config/compiler:rtti" ] data_deps = [ ":QtWebEngineCoreSandbox" ] } + if (use_embedded_config) { + configs += [ ":embedded_config" ] + } sources = [ @GN_HEADERS@, diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 0a0a9323a..36c737693 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -12,3 +12,6 @@ macos [WebViewFindText::test_findTextInterruptedByLoad] b2qt arm 64bit + +[WebEngineViewLoadUrl::test_loadStartedAfterInPageNavigation] +b2qt diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST index ed022878e..5d9cc038a 100644 --- a/tests/auto/widgets/qwebengineview/BLACKLIST +++ b/tests/auto/widgets/qwebengineview/BLACKLIST @@ -6,3 +6,6 @@ windows [navigateOnDrop:file_no_navigate] windows + +[horizontalScrollbarTest] +b2qt # different scrollbar |