From 7cbd4ebf240ea720b70851fd40945291d69add16 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 19 Dec 2016 18:57:12 +0100 Subject: Add print and pdf feature to new configure system Currently printing and pdf are bounded together. Make compilation optional by adding it as a feature. Fix formatting of embedded_linux.pri Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I53a2baea656df0a5b6139365ed06385c9ebc5830 Reviewed-by: Allan Sandfeld Jensen --- tools/qmake/mkspecs/features/configure.prf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/qmake') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index bea1c5fdf..3cdcc400b 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -23,6 +23,7 @@ defineTest(runConfigure) { isQtMinimum(5, 8) { include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) QT_FOR_CONFIG += webengine-private + qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code @@ -86,9 +87,6 @@ defineTest(runConfigure) { else: log("System NSS not found, BoringSSL will be used.$${EOL}") } } - !cross_compile { - WEBENGINE_CONFIG += enable_pdf - } isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) -- cgit v1.2.3