diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:20:58 +0200 |
| commit | cba8f2605f34649e3ca2a767edc7ac9509e7fee9 (patch) | |
| tree | c3fbf81bc0eee5db87c357366b22ffd62b9c3dcc /src/core/config | |
| parent | 0c366eb741d8d925418c517d3954900c090aca3d (diff) | |
| parent | 434ef539381bbc3c19f54f914d5bda83eafdc92b (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/webenginewidgets/api/qwebenginepage.cpp
Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6
Diffstat (limited to 'src/core/config')
| -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 \ |