diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-12-19 18:57:12 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-01-16 14:10:28 +0000 |
| commit | 7cbd4ebf240ea720b70851fd40945291d69add16 (patch) | |
| tree | fa52fefab087217e118272829cf68c1c7cd2b97b /tools | |
| parent | c188dda0e9c9755ff57eba307d12bd0bb027c608 (diff) | |
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 <allan.jensen@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 |
1 files changed, 1 insertions, 3 deletions
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)) |