diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /src/buildtools | |
parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'src/buildtools')
-rw-r--r-- | src/buildtools/config/common.pri | 15 | ||||
-rw-r--r-- | src/buildtools/config/linux.pri | 2 | ||||
-rw-r--r-- | src/buildtools/config/support.pri | 11 | ||||
-rw-r--r-- | src/buildtools/config/windows.pri | 1 | ||||
-rw-r--r-- | src/buildtools/configure.json | 67 |
5 files changed, 54 insertions, 42 deletions
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index 85781d251..cf990c79b 100644 --- a/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri @@ -14,25 +14,28 @@ gn_args += \ enable_nacl=false \ enable_remoting=false \ enable_reporting=false \ - enable_resource_whitelist_generation=false \ + enable_resource_allowlist_generation=false \ enable_swiftshader=false \ + enable_swiftshader_vulkan=false \ angle_enable_swiftshader=false \ - enable_web_auth=true \ enable_web_speech=false \ enable_widevine=true \ forbid_non_component_debug_builds=false \ has_native_accessibility=false \ safe_browsing_mode=0 \ + skia_use_dawn=false \ toolkit_views=false \ treat_warnings_as_errors=false \ use_allocator_shim=false \ use_allocator=\"none\" \ - use_custom_libcxx=false + use_custom_libcxx=false \ + chrome_pgo_phase=0 \ + enable_hangout_services_extension=true -# No closure compile supported at this time +# Closure compile requires Java gn_args += \ - closure_compile=false \ - optimize_webui=false + optimize_webui=false \ + enable_js_type_check=false # We always embed v8 startup data currently gn_args += \ diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index 56c18bdb5..7507d51ef 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -11,13 +11,13 @@ gn_args += \ use_cups=false \ use_gio=false \ use_gnome_keyring=false \ - linux_use_bundled_binutils=false \ use_udev=true \ use_bundled_fontconfig=false \ use_sysroot=false \ enable_session_service=false \ is_cfi=false \ use_ozone=true \ + use_x11=false \ ozone_auto_platforms=false \ ozone_platform_headless=false \ ozone_platform_external=true \ diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index e192f8777..4ba387fc2 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { !qtwebengine_checkForGperf(QtWebEngine):return(false) !qtwebengine_checkForBison(QtWebEngine):return(false) !qtwebengine_checkForFlex(QtWebEngine):return(false) - !qtwebengine_checkForPython2(QtWebengine):return(false) + !qtwebengine_checkForPython2(QtWebEngine):return(false) !qtwebengine_checkForSanitizer(QtWebEngine):return(false) linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false) @@ -151,6 +151,15 @@ defineTest(qtwebengine_checkForPython2) { return(true) } +defineTest(qtwebengine_checkForNodejs) { + module = $$1 + !qtConfig(webengine-nodejs) { + qtwebengine_skipBuild("Nodejs is required to build $${module}.") + return(false) + } + return(true) +} + defineTest(qtwebengine_checkForSanitizer) { module = $$1 sanitizer:!qtConfig(webengine-sanitizer) { diff --git a/src/buildtools/config/windows.pri b/src/buildtools/config/windows.pri index bd236e1a5..843d6f2b1 100644 --- a/src/buildtools/config/windows.pri +++ b/src/buildtools/config/windows.pri @@ -4,7 +4,6 @@ gn_args += \ use_sysroot=false \ enable_session_service=false \ ninja_use_custom_environment_files=false \ - is_multi_dll_chrome=false \ win_linker_timing=true \ com_init_check_hook_disabled=true \ heterogeneous_executables=true \ diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 24ffa71aa..5819fb860 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -68,6 +68,12 @@ { "type": "pkgConfig", "args": "x11" } ] }, + "webengine-xproto-gl": { + "label": "xproto (glproto)", + "sources": [ + { "type": "pkgConfig", "args": "glproto" } + ] + }, "webengine-glib": { "label": "glib-2.0 >= 2.32.0", "sources": [ @@ -102,12 +108,6 @@ "-ljpeg" ] }, - "webengine-jsoncpp": { - "label": "jsoncpp", - "sources": [ - { "type": "pkgConfig", "args": "jsoncpp" } - ] - }, "webengine-libevent": { "label": "libevent", "sources": [ @@ -126,12 +126,6 @@ { "type": "pkgConfig", "args": "libpng >= 1.6.0" } ] }, - "webengine-protobuf": { - "label": "protobuf", - "sources": [ - { "type": "pkgConfig", "args": "protobuf" } - ] - }, "webengine-zlib": { "label": "zlib", "sources": [ @@ -155,9 +149,9 @@ ] }, "webengine-icu": { - "label": "icu >= 64", + "label": "icu >= 65", "sources": [ - { "type": "pkgConfig", "args": "icu-uc >= 64 icu-i18n >= 64" } + { "type": "pkgConfig", "args": "icu-uc >= 65 icu-i18n >= 65" } ] }, "webengine-webp": { @@ -238,10 +232,11 @@ "vpx_codec_cx_pkt pkt;", "pkt.data.frame.width[0] = 0u;", "pkt.data.frame.height[0] = 0u;", - "auto a = CONSTRAINED_FROM_ABOVE_DROP;" + "auto a = CONSTRAINED_FROM_ABOVE_DROP;", + "auto b = VPX_IMG_FMT_NV12;" ] }, - "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h" ], + "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h", "vpx/vpx_image.h" ], "sources": [ { "type": "pkgConfig", "args": "vpx" }, "-lvpx" @@ -321,10 +316,6 @@ "type": "detectJumboBuild", "log": "merge_limit" }, - "webengine-protoc": { - "label": "protoc", - "type": "detectProtoc" - }, "webengine-win-compiler64": { "label": "64bit compiler", "type": "isWindowsHostCompiler64" @@ -358,6 +349,11 @@ "label": "linker supports -z noexecstack", "type": "linkerSupportsFlag", "flag": "-z,noexecstack" + }, + "webengine-nodejs": { + "label": "node.js", + "type": "detectNodeJS", + "log": "version10" } }, "features": { @@ -374,6 +370,7 @@ && features.webengine-bison && features.webengine-flex && features.webengine-python2 + && features.webengine-nodejs && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) @@ -444,6 +441,16 @@ "condition": "tests.webengine-flex", "output": [ "privateFeature" ] }, + "webengine-nodejs": { + "label": "node.js", + "condition": "tests.webengine-nodejs", + "output": [ "privateFeature" ] + }, + "webengine-nodejs10": { + "label": "node.js", + "condition": "tests.webengine-nodejs && tests.webengine-nodejs.version10", + "output": [ "privateFeature" ] + }, "webengine-system-ninja": { "label": "Use System Ninja", "condition": "tests.webengine-ninja", @@ -513,6 +520,11 @@ "condition": "config.unix && libs.webengine-x11", "output": [ "privateFeature" ] }, + "webengine-system-xproto-gl" : { + "label": "xproto (glproto)", + "condition": "config.unix && libs.webengine-xproto-gl", + "output": [ "privateFeature" ] + }, "webengine-host-pkg-config": { "label": "host-pkg-config", "condition": "config.unix && tests.webengine-host-pkg-config", @@ -529,6 +541,7 @@ && features.webengine-system-xcomposite && features.webengine-system-xcursor && features.webengine-system-xi + && features.webengine-system-xproto-gl && features.webengine-system-xtst", "output": [ "privateFeature" ] }, @@ -575,16 +588,6 @@ "condition": "config.unix && libs.webengine-libevent", "output": [ "privateFeature" ] }, - "webengine-system-jsoncpp" : { - "label": "jsoncpp", - "condition": "config.unix && libs.webengine-jsoncpp", - "output": [ "privateFeature" ] - }, - "webengine-system-protobuf" : { - "label": "protobuf", - "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc", - "output": [ "privateFeature" ] - }, "webengine-system-png" : { "label": "png", "condition": "config.unix && features.system-png && libs.webengine-png", @@ -754,7 +757,6 @@ "section": "Qt WebEngine Build Tools", "entries": [ "webengine-system-ninja", - "webengine-system-gn", { "message": "Jumbo Build Merge Limit", "type": "jumboBuild" @@ -785,6 +787,7 @@ "webengine-system-xcomposite", "webengine-system-xcursor", "webengine-system-xi", + "webengine-system-xproto-gl", "webengine-system-xtst" ] }, @@ -803,8 +806,6 @@ "webengine-system-zlib", "webengine-system-minizip", "webengine-system-libevent", - "webengine-system-jsoncpp", - "webengine-system-protobuf", "webengine-system-libxml2", "webengine-system-lcms2", "webengine-system-png", |