diff options
author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-10-30 09:45:37 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@theqtcompany.com> | 2015-10-30 10:01:25 +0000 |
commit | 8bc8777ef3b4fd9032eb5b6be46ee47f60fc9ec2 (patch) | |
tree | 2ef0b36c4103be578c26123f5c3ca9305df29768 | |
parent | 9ec4353648b549de6f95386ca18aafb2732a6a19 (diff) |
Do not use system harfbuzz unless it is configured.
Change-Id: I8d2aca1d3192be08295af57b08489bfefc8e0dc4
Task-number: QTBUG-49128
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r-- | src/core/config/desktop_linux.pri | 2 | ||||
-rw-r--r-- | src/core/config/embedded_linux.pri | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 041b094a1..7f27659e3 100644 --- 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 index cc8c40f8e..3cf1add0d 100644 --- 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 |