summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-05-25 17:13:42 +0200
committerKai Koehne <kai.koehne@qt.io>2018-05-28 10:54:24 +0000
commitea28cff7524bf0409b43c8ba3ede8fe2f7022ae4 (patch)
tree3a534cffb317506546d993d77c85a94d1654e182 /src
parent1b1411c589cb7ed29916762bcfedbbb68e657d2f (diff)
Do make freetype checks in Qt Gui and Qt WebEngine orthogonal
Qt WebEngine requires a newer freetype version then Qt Gui. Also, even if we fall back to 'Qt' freetype in Qt Gui doesn't mean that this version is shared with Qt WebEngine ... so it's best to completely detangle these. Task-number: QTBUG-68439 Change-Id: I081a23fe3e573d717a659e9bccebb14d68e97392 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/config/linux.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 68d64fd4f..b56134ad9 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -133,7 +133,7 @@ host_build {
}
qtConfig(webengine-system-png): gn_args += use_system_libpng=true
qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true
- qtConfig(system-freetype): gn_args += use_system_freetype=true
+ qtConfig(webengine-system-freetype): gn_args += use_system_freetype=true
qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true
!qtConfig(webengine-system-glib): gn_args += use_glib=false
qtConfig(webengine-pulseaudio) {