diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-12 16:10:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-12 22:20:26 +0000 |
| commit | 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c (patch) | |
| tree | 2d3c60ff4710597fc466573e1d56f09c3d584800 /src/core/config/linux.pri | |
| parent | e0dd0c4e02efc3897c4c1f814ee89963849ffd50 (diff) | |
Fix build with freetype2 depending on harfbuzz
Chromium uses system freetype2 by default but not harfbuzz by default,
since some newer versions of freetype2 depends on harfbuzz, we need to
configure Chromium to use system harfbuzz in those cases.
Change-Id: Ic15abe85c5b7e5ef1c3d82420efbc8605c2fe1ae
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 8d736d0c1..7f269245e 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -27,9 +27,9 @@ GYP_CONFIG += \ contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 -contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 +use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 use?(system_libevent): GYP_CONFIG += use_system_libevent=1 use?(system_libwebp): GYP_CONFIG += use_system_libwebp=1 use?(system_libsrtp): GYP_CONFIG += use_system_libsrtp=1 |