diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2016-11-22 09:19:12 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-23 17:23:50 +0000 |
commit | ecfb3ba8a7eb116c838a1acd5b82ca59ce76b082 (patch) | |
tree | f97fcf56332371a0b2b3e78e598a1e2f19f6e3e5 /tools/qmake | |
parent | a5c20a32def14aae8d3449408fa86111f771c95e (diff) |
Add pkg-config test for system harfbuzz version on linux
Older harfbuzz versions like the one bundled with Ubuntu 16.04 cause
crashes of Qt WebEngine applications. Use the bundled copy although
Qt was configured with -system-harfbuzz in those scenarios.
Task-number: QTBUG-56895
Change-Id: I8fad6754447ba32c3630e6772ca2ae6d4fd710c1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools/qmake')
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index e2bb44f20..c6f07e39d 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -28,7 +28,10 @@ defineTest(runConfigure) { !cross_compile: qtConfig(xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse qtConfig(system-png): REQUIRED_PACKAGES += libpng - qtConfig(system-harfbuzz): REQUIRED_PACKAGES += harfbuzz + qtConfig(system-harfbuzz) { + packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz + else: log("System harfbuzz is too old (min. version 1.2). Using Chromium's copy.$${EOL}") + } !cross_compile: REQUIRED_PACKAGES += libpci for(package, $$list($$REQUIRED_PACKAGES)) { |