From 637beda0062ff65918823147830b52e29ae550a6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 8 May 2017 14:44:17 +0200 Subject: Fix backwards compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWebEngine supports building with last stable and last LTS Qt releases. Guard some 5.7-5.9 API from being used when not available, and reinstate the default features for 5.6 LTS builds. Change-Id: Ia288a49109d011a2bee883d4a2d38d994b497d59 Reviewed-by: Michael Brüning --- mkspecs/features/configure.prf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index b293a5efa..f56f9a55e 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -39,7 +39,12 @@ defineTest(runConfigure) { qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu else: WEBENGINE_CONFIG += use_bundled_icu } else { - cross_compile: WEBENGINE_CONFIG += embedded_build reduce_binary_size + # Feature defaults when building with Qt 5.6 LTS: + cross_compile { + WEBENGINE_CONFIG += embedded_build reduce_binary_size + } else { + WEBENGINE_CONFIG += use_spellchecker use_webrtc use_pepper_plugins use_printing use_pdf + } } isQtMinimum(5, 9) { qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code -- cgit v1.2.3