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 /src/core/config | |
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 'src/core/config')
-rw-r--r-- | src/core/config/common.pri | 12 | ||||
-rw-r--r-- | src/core/config/desktop_linux.pri | 5 | ||||
-rw-r--r-- | src/core/config/embedded_linux.pri | 5 | ||||
-rw-r--r-- | src/core/config/embedded_qnx.pri | 3 | ||||
-rw-r--r-- | src/core/config/mac_osx.pri | 5 | ||||
-rw-r--r-- | src/core/config/windows.pri | 5 |
6 files changed, 16 insertions, 19 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index b5bb23684..b125cff93 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -13,3 +13,15 @@ sanitize_address: GYP_CONFIG += asan=1 sanitize_thread: GYP_CONFIG += tsan=1 sanitize_memory: GYP_CONFIG += msan=1 sanitize_undefined: GYP_CONFIG += ubsan=1 + +use?(printing) { + GYP_CONFIG += enable_basic_printing=1 enable_print_preview=1 +} else { + GYP_CONFIG += enable_basic_printing=0 enable_print_preview=0 +} + +use?(pdf) { + GYP_CONFIG += enable_pdf=1 +} else { + GYP_CONFIG += enable_pdf=0 +} diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 23044619b..2a39f7aee 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -4,10 +4,7 @@ include(linux.pri) GYP_CONFIG += \ desktop_linux=1 \ - enable_widevine=1 \ - enable_basic_printing=1 \ - enable_print_preview=1 \ - enable_pdf=1 + enable_widevine=1 clang { GYP_CONFIG += werror= diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 7a909f1e2..e390a158f 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -9,16 +9,13 @@ GYP_CONFIG += \ embedded=1 \ enable_autofill_dialog=0 \ enable_automation=0 \ - enable_basic_printing=0 \ enable_captive_portal_detection=0 \ enable_extensions=0 \ enable_google_now=0 \ enable_language_detection=0 \ enable_managed_users=0 \ - enable_pdf=0 \ enable_plugin_installation=0 \ enable_plugins=0 \ - enable_print_preview=0 \ enable_session_service=0 \ enable_task_manager=0 \ enable_themes=0 \ @@ -39,6 +36,6 @@ GYP_CONFIG += \ use_x11=0 \ v8_use_snapshot=false \ want_separate_host_toolset=1 \ - angle_enable_gl=0 \ + angle_enable_gl=0 WEBENGINE_CONFIG *= reduce_binary_size diff --git a/src/core/config/embedded_qnx.pri b/src/core/config/embedded_qnx.pri index 3effdb816..f24888776 100644 --- a/src/core/config/embedded_qnx.pri +++ b/src/core/config/embedded_qnx.pri @@ -4,9 +4,6 @@ include(common.pri) GYP_CONFIG += \ disable_nacl=1 \ - enable_basic_printing=0 \ - enable_pdf=0 \ - enable_plugins=0 \ enable_webrtc=0 \ use_ash=0 \ use_aura=1 \ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 4111236ed..17f200449 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -25,10 +25,7 @@ GYP_CONFIG += \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \ clang_use_chrome_plugins=0 \ - enable_widevine=1 \ - enable_basic_printing=1 \ - enable_print_preview=1 \ - enable_pdf=1 + enable_widevine=1 # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we # disable the API usage if the SDK version is lower. diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index a1c116ff8..51b83ac04 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -6,10 +6,7 @@ GYP_CONFIG += \ disable_nacl=1 \ remoting=0 \ use_ash=0 \ - enable_widevine=1 \ - enable_basic_printing=1 \ - enable_print_preview=1 \ - enable_pdf=1 + enable_widevine=1 # Libvpx build needs additional search path on Windows. GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\"" |