Do not use system harfbuzz unless it is configured.

Michael Bruning · Michael Brüning · commit 8bc8777ef3b4 · 2015-10-30T10:01:25.000Z
Change-Id: I8d2aca1d3192be08295af57b08489bfefc8e0dc4
Task-number: QTBUG-49128
Reviewed-by: Liang Qi &lt;liang.qi@theqtcompany.com&gt;
Reviewed-by: Allan Sandfeld Jensen &lt;allan.jensen@theqtcompany.com&gt;
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
@@ -19,3 +19,5 @@ GYP_CONFIG += \
 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
 
 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0
+
+!contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=0
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
@@ -52,3 +52,4 @@ GYP_CONFIG += \
 
 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
 !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0
+!contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=0

Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,4 @@ GYP_CONFIG += \`
`52`	`52`
`53`	`53`	`contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1`
`54`	`54`	`!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0`
	`55`	`+!contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=0`