diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-07 10:38:33 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-07 11:28:45 +0000 |
| commit | 80ef5d39381f43af2e2b1ca7d2443d687f09e413 (patch) | |
| tree | 57ce9e2dd45019c6776e019d65cf7d83a0f81ea7 /src/core | |
| parent | 5c847f10affda81210b45fbaa884c2eb46a16604 (diff) | |
Respect use system opus, vpx and icu configuration
Also updates Chromium pulling in:
eb8da98 Reland: Optionally unbundle libvpx, opus and FLAC
6cdd0a0 Legalize chromium's directory sort
503e84f46 Optionally link with system ICU
e429a99 Fix incorrect dependency on shim headers
Change-Id: If6da022c410ac5de6ab40ab8a800bf547406efb5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/linux.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 9d43113d1..1251ae3cf 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -85,10 +85,10 @@ use?(gn) { #use?(system_libsrtp): gn_args += use_system_libsrtp=true use?(system_libxslt): gn_args += use_system_libxml=true use_system_libxslt=true #use?(system_jsoncpp): gn_args += use_system_jsoncpp=true - #use?(system_opus): gn_args += use_system_opus=true + use?(system_opus): gn_args += use_system_opus=true use?(system_snappy): gn_args += use_system_snappy=true - #use?(system_vpx): gn_args += use_system_libvpx=true - #use?(system_icu): gn_args += use_system_icu=true icu_use_data_file=false + use?(system_vpx): gn_args += use_system_libvpx=true + use?(system_icu): gn_args += use_system_icu=true icu_use_data_file=false #use?(system_ffmpeg): gn_args += use_system_ffmpeg=true #use?(system_protobuf): gn_args += use_system_protobuf=true } |