From ab94349cb2fa073e8aec661a797de1cfc3819752 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 25 Jan 2017 15:09:31 +0100 Subject: Simple adaptations to Chromium 55 The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek --- tools/qmake/mkspecs/features/configure.prf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tools/qmake/mkspecs/features/configure.prf') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index b0e09aca0..b17626c3e 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -35,9 +35,11 @@ defineTest(runConfigure) { } isQtMinimum(5, 9) { qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code - linux: !cross_compile: use_gold_linker: WEBENGINE_CONFIG += use_gn + linux: !cross_compile: WEBENGINE_CONFIG += use_gn macos: WEBENGINE_CONFIG += use_gn + win32: WEBENGINE_CONFIG += use_gn } + !use?(gn): skipBuild("Chromium 55 and new can only be built with GN") linux { QT_FOR_CONFIG += gui-private @@ -51,6 +53,10 @@ defineTest(runConfigure) { packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz else: log("System harfbuzz is too old (min. version 1.2). Using Chromium's copy.$${EOL}") } + qtConfig(glib) { + packagesExist("\'glib-2.0 >= 2.32.0\'"): WEBENGINE_CONFIG += use_glib + else: skipBuild("System glib is too old (min. version 2.32).$${EOL}") + } !contains(WEBENGINE_CONFIG, embedded_build): REQUIRED_PACKAGES += libpci for(package, $$list($$REQUIRED_PACKAGES)) { -- cgit v1.2.3