summaryrefslogtreecommitdiffstats
path: root/tools/qmake
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-10-12 16:10:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-10-12 22:20:26 +0000
commit981e38d2dc82c047c6ad8ec19427d3ac7434dc3c (patch)
tree2d3c60ff4710597fc466573e1d56f09c3d584800 /tools/qmake
parente0dd0c4e02efc3897c4c1f814ee89963849ffd50 (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 'tools/qmake')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index f117e214d..758cd9fde 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -25,11 +25,14 @@ defineTest(runConfigure) {
!config_libcap:skipBuild("libcap development package appears to be missing")
!config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
- REQUIRED_PACKAGES = dbus-1 fontconfig
+ REQUIRED_PACKAGES = dbus-1 fontconfig freetype2
contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse
contains(QT_CONFIG, system-png): REQUIRED_PACKAGES += libpng
- contains(QT_CONFIG, system-harfbuzz): REQUIRED_PACKAGES += harfbuzz
+ contains(QT_CONFIG, system-harfbuzz)|packagesExist("\'freetype2 >= 2.5.3\'"): {
+ WEBENGINE_CONFIG += use_system_harfbuzz
+ REQUIRED_PACKAGES += harfbuzz
+ }
!cross_compile: REQUIRED_PACKAGES += libpci
for(package, $$list($$REQUIRED_PACKAGES)) {