diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-07 13:28:56 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-07 20:39:30 +0000 |
| commit | e63fa9829ce57fee2c94bfa92e81f4c3186f0461 (patch) | |
| tree | ca93087766693e1086cade655a077912a0dd18f5 | |
| parent | da2ad89d330291679b288e87ba620b37870d8cf3 (diff) | |
Unbundle pdfium libraries
We now have gn flags to request unbundling of zlib and lcms2 in pdfium
and can add those to our configure system.
Task-number: QTBUG-61746
Change-Id: Iccc4c2a09b7b99121d79348f9e0636785b29f503
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | configure.json | 13 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 12 |
2 files changed, 20 insertions, 5 deletions
diff --git a/configure.json b/configure.json index 82d4254bc..c3a82f32d 100644 --- a/configure.json +++ b/configure.json @@ -163,6 +163,12 @@ "sources": [ { "type": "pkgConfig", "args": "libpng >= 1.6.0" } ] + }, + "lcms2": { + "label": "lcms2", + "sources": [ + { "type": "pkgConfig", "args": "lcms2" } + ] } }, @@ -510,6 +516,12 @@ "condition": "config.unix && libs.libxml2 && tests.icuuc", "output": [ "privateFeature" ] }, + "system-lcms2" : { + "label": "lcms2", + "autoDetect": "libs.lcms2", + "condition": "config.unix && features.printing-and-pdf", + "output": [ "privateFeature" ] + }, "webengine-sanitizer" : { "label": "Sanitizer ", "autoDetect": "config.sanitizer && tests.sanitizer", @@ -583,6 +595,7 @@ "system-jsoncpp", "system-protobuf", "system-libxml2", + "system-lcms2", "webengine-system-png", "webengine-system-harfbuzz" ] diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 78f3e5093..fbe44dc4c 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -117,6 +117,7 @@ host_build { qtConfig(webengine-system-zlib): qtConfig(system-minizip) { gn_args += use_system_zlib=true use_system_minizip=true + qtConfig(printing-and-pdf): gn_args += pdfium_use_system_zlib=true } qtConfig(webengine-system-png): gn_args += use_system_libpng=true qtConfig(system-jpeg): gn_args += use_system_libjpeg=true @@ -139,14 +140,15 @@ host_build { !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false qtConfig(system-libevent): gn_args += use_system_libevent=true - qtConfig(system-libwebp): gn_args += use_system_libwebp=true - qtConfig(system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true - qtConfig(system-opus): gn_args += use_system_opus=true + qtConfig(system-libwebp): gn_args += use_system_libwebp=true + qtConfig(system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true + qtConfig(system-opus): gn_args += use_system_opus=true qtConfig(system-snappy): gn_args += use_system_snappy=true qtConfig(system-libvpx): gn_args += use_system_libvpx=true - qtConfig(system-icu): gn_args += use_system_icu=true icu_use_data_file=false - qtConfig(system-ffmpeg): gn_args += use_system_ffmpeg=true + qtConfig(system-icu): gn_args += use_system_icu=true icu_use_data_file=false + qtConfig(system-ffmpeg): gn_args += use_system_ffmpeg=true qtConfig(system-re2): gn_args += use_system_re2=true + qtConfig(system-lcms2): gn_args += use_system_lcms2=true # FIXME: #qtConfig(system-protobuf): gn_args += use_system_protobuf=true |