diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-05-25 17:13:42 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-05-28 10:54:24 +0000 |
| commit | ea28cff7524bf0409b43c8ba3ede8fe2f7022ae4 (patch) | |
| tree | 3a534cffb317506546d993d77c85a94d1654e182 | |
| parent | 1b1411c589cb7ed29916762bcfedbbb68e657d2f (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>
| -rw-r--r-- | configure.json | 14 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/configure.json b/configure.json index f0d6391b9..8a43b80d2 100644 --- a/configure.json +++ b/configure.json @@ -202,6 +202,12 @@ "sources": [ { "type": "pkgConfig", "args": "lcms2" } ] + }, + "webengine-freetype": { + "label": "freetype >= 2.4.2", + "sources": [ + { "type": "pkgConfig", "args": "freetype2 >= 2.4.2" } + ] } }, @@ -386,6 +392,11 @@ "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib", "output": [ "privateFeature" ] }, + "webengine-system-freetype" : { + "label": "freetype", + "condition": "config.unix && features.system-freetype && libs.webengine-freetype", + "output": [ "privateFeature" ] + }, "webengine-python2": { "label": "python2", "condition": "tests.webengine-python2", @@ -690,7 +701,8 @@ "webengine-system-lcms2", "webengine-system-png", "webengine-system-jpeg", - "webengine-system-harfbuzz" + "webengine-system-harfbuzz", + "webengine-system-freetype" ] }, { 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) { |