diff options
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/linux.pri | 1 | ||||
| -rw-r--r-- | src/buildtools/config/support.pri | 2 | ||||
| -rw-r--r-- | src/buildtools/config/windows.pri | 5 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index e585d5cbc..add563f28 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -199,6 +199,7 @@ host_build { qtConfig(build-qtwebengine-core):qtConfig(webengine-ozone-x11) { gn_args += ozone_platform_x11=true packagesExist(xscrnsaver): gn_args += use_xscrnsaver=true + qtConfig(webengine-webrtc): gn_args += rtc_use_x11=true } qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 86ca2f80e..8077b12ff 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -62,7 +62,7 @@ defineReplace(qtwebengine_checkError) { } linux:!qtwebengine_checkErrorForLinux():return(false) - win:!qtwebengine_checkErrorForWindows():return(false) + win32:!qtwebengine_checkErrorForWindows():return(false) macos:!qtwebengine_checkErrorForMacOS():return(false) sanitizer: !qtConfig(webengine-sanitizer) { diff --git a/src/buildtools/config/windows.pri b/src/buildtools/config/windows.pri index 41831ddf3..2e5ebb876 100644 --- a/src/buildtools/config/windows.pri +++ b/src/buildtools/config/windows.pri @@ -6,7 +6,8 @@ gn_args += \ ninja_use_custom_environment_files=false \ is_multi_dll_chrome=false \ win_linker_timing=true \ - com_init_check_hook_disabled=true + com_init_check_hook_disabled=true \ + heterogeneous_executables=true clang_cl { clang_full_path = $$system_path($$which($${QMAKE_CXX})) @@ -15,7 +16,7 @@ clang_cl { clang_prefix = $$join(clang_dir,,,"\..") gn_args += \ is_clang=true \ - use_ldd=true \ + use_lld=true \ clang_use_chrome_plugins=false \ clang_base_path=\"$$system_path($$clean_path($$clang_prefix))\" } else { diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index cdec15de9..d6c47dfc6 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -5,6 +5,7 @@ "gui-private", "printsupport" ], + "condition": "module.gui", "commandline": { "options": { "build-qtwebengine-core": "boolean", @@ -386,7 +387,8 @@ && !config.static && (!config.linux || features.pkg-config) && (!features.xcb || features.webengine-ozone-x11) - && (!config.win32 || features.webengine-winversion)", + && (!config.win32 || features.webengine-winversion) + && !config.ios", "output": [ "privateFeature" ] }, "webengine-qtpdf-support": { @@ -408,7 +410,6 @@ "build-qtwebengine-core": { "label": "Build Qt WebEngine Core", "purpose": "Provides WebEngine Core support.", - "autoDetect": "false", "output": [ "privateFeature" ] }, "build-qtpdf": { |