diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-24 21:13:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-24 21:13:05 +0000 |
| commit | 5d34532b1989356e1221dd3ff267e94085720bfe (patch) | |
| tree | 84dc64c80850ed6afb8d35030f6b7a949c15d961 /src | |
| parent | 781111af3498527d8652ae02fa64be3114c0734f (diff) | |
| parent | 5f1fda048f2e8968166aaa70315c375a7fbad931 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.0' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtools/configure_host.pro | 3 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 6 |
2 files changed, 7 insertions, 2 deletions
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\" " \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index c5329dfcc..6f7b27f10 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -112,12 +112,14 @@ 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) { 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 |