diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:05:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:05:09 +0200 |
| commit | 6bef847c1e03acdf4aa2ffb81153eee65b70d0df (patch) | |
| tree | ba5618cce726218588095f07ad523fa9c32f0922 /src/core | |
| parent | dd78b4c3d9673b12eb3006140b80056273d4a815 (diff) | |
| parent | 5da2b1ae6284c7da608eda15a00f43d42928ecbb (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: Ie9373d6278c9ba1514de5640802d985ec35aceb2
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 91b14003c..cc8c40f8e 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -43,6 +43,7 @@ GYP_CONFIG += \ use_openssl=1 \ use_ozone=1 \ use_pango=0 \ + use_system_fontconfig=1 \ use_system_icu=1 \ icu_use_data_file_flag=0 \ use_x11=0 \ |