From 75d700204b3e0a7d66327afbf28e1869a062e397 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 10 Nov 2016 14:11:57 +0100 Subject: Start using new config system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds the optionproprietary codecs to configure.json, so it can be selected by the global configure, and is summarized there too. Keeps the old system for compat with building against older Qt. Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de Reviewed-by: Michael Brüning --- tools/qmake/mkspecs/features/configure.prf | 5 +++++ 1 file changed, 5 insertions(+) (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 675787bcf..105e3bc3c 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -75,6 +75,11 @@ defineTest(runConfigure) { else: log("System NSS not found, BoringSSL will be used.$${EOL}") } } + isQtMinimum(5, 8) { + include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) + QT_FOR_CONFIG += webengine-private + qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs + } isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) -- cgit v1.2.3