From beb152924667f10059b8aa7354a07e04ac25d8cd Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 13 Nov 2017 13:43:32 +0100 Subject: Add missing 'webengine' prefix in configure.json Fix condition mixup in webengine-system-lcms2 configuration Change-Id: Iff8513b1e1102c3ca6402b2ec346dfdded2c110a Reviewed-by: Allan Sandfeld Jensen --- src/core/config/linux.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index c5329dfcc..fd22c880f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -117,7 +117,7 @@ host_build { qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) { gn_args += use_system_zlib=true use_system_minizip=true - qtConfig(printing-and-pdf): gn_args += pdfium_use_system_zlib=true + qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true } qtConfig(webengine-system-png): gn_args += use_system_libpng=true qtConfig(system-jpeg): gn_args += use_system_libjpeg=true -- cgit v1.2.3 From a04dfb3e91743f01b39bfb63a4a74aab498d37fa Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 8 Nov 2017 09:34:15 +0100 Subject: Add GN_PKG_CONFIG_HOST to set host pkg-config Yocto builds need to pass pkg-config-native to build natvie tools. Task-number: QTBUG-63140 Change-Id: I75ef77461b56bd599240da95df13261aa9e4be75 Reviewed-by: Allan Sandfeld Jensen --- src/core/config/linux.pri | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index fd22c880f..6f7b27f10 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -112,7 +112,9 @@ host_build { # Strip '>2 /dev/null' from $$pkgConfigExecutable() PKGCONFIG = $$first($$list($$pkgConfigExecutable())) gn_args += pkg_config=\"$$PKGCONFIG\" - gn_args += host_pkg_config=\"pkg-config\" + PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST) + isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = pkg-config + gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\" } qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) { -- cgit v1.2.3 From 5617373d9b5ded9d4c724b15132d6989ed9e05f9 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 10 Nov 2017 21:15:16 +0100 Subject: Add GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS Add a way to add pass extra compilation flags when using host toolchain. This is currently used by yocto to get correct lookup path for native headers. Task-number: QTBUG-63140 Change-Id: Ic8f3e394840635b2a0a26acf593888e1f79439f6 Reviewed-by: Samuli Piippo --- src/buildtools/configure_host.pro | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro index f1b3d47b0..dd0d3e327 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -23,6 +23,8 @@ contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TAR else: contains(GN_V8_HOST_CPU, mips64el): GN_V8_HOST_CPU = "mipsel" } +GN_HOST_EXTRA_CPPFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS) + # We always use the gcc_toolchain, because clang_toolchain is just # a broken wrapper around it for Google's custom clang binaries. GN_CONTENTS = \ @@ -34,6 +36,7 @@ GN_CONTENTS = \ " ld = \"$$which($$QMAKE_LINK)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ +" extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ " toolchain_args = { " \ " current_os = \"$$GN_OS\" " \ " current_cpu = \"$$GN_HOST_CPU\" " \ -- cgit v1.2.3