diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 10:55:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 15:52:24 +0100 |
| commit | 91696b2cb090e5b6147a30465f74d8d37db48615 (patch) | |
| tree | e73d4adee4f9f2040e8986b8388737d3bf866a5d /src/buildtools | |
| parent | 1b79f9ccffe468107be5f6c5d3ad42cdcfdef585 (diff) | |
| parent | dad48eb41d1b4b4b32c73884a1c29dd6d9408c33 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/configure.json | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 2da87a11c..24ffa71aa 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -75,9 +75,9 @@ ] }, "webengine-harfbuzz": { - "label": "harfbuzz >= 2.2.0", + "label": "harfbuzz >= 2.4.0", "sources": [ - { "type": "pkgConfig", "args": "harfbuzz >= 2.2.0" } + { "type": "pkgConfig", "args": "harfbuzz >= 2.4.0 harfbuzz-subset >= 2.4.0" } ] }, "webengine-jpeglib": { @@ -545,6 +545,11 @@ "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz", "output": [ "privateFeature" ] }, + "webengine-qt-harfbuzz" : { + "label": "qtharfbuzz", + "condition": "config.static && !features.system-harfbuzz && features.harfbuzz", + "output": [ "privateFeature" ] + }, "webengine-system-glib" : { "label": "glib", "condition": "config.unix && libs.webengine-glib", @@ -560,6 +565,11 @@ "condition": "config.unix && features.system-zlib && libs.webengine-zlib", "output": [ "privateFeature" ] }, + "webengine-qt-zlib" : { + "label": "QtZlib", + "condition": "config.static && !features.system-zlib", + "output": [ "privateFeature" ] + }, "webengine-system-libevent" : { "label": "libevent", "condition": "config.unix && libs.webengine-libevent", @@ -580,11 +590,21 @@ "condition": "config.unix && features.system-png && libs.webengine-png", "output": [ "privateFeature" ] }, + "webengine-qt-png" : { + "label": "qtlibpng", + "condition" : "config.static && !features.system-png && features.png", + "output": [ "privateFeature" ] + }, "webengine-system-jpeg" : { "label": "JPEG", "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib", "output": [ "privateFeature" ] }, + "webengine-qt-jpeg" : { + "label": "qtlibjpeg", + "condition": "config.static && !features.system-jpeg && features.jpeg", + "output": [ "privateFeature" ] + }, "webengine-system-re2": { "label": "re2", "condition": "config.unix && libs.webengine-re2", @@ -627,6 +647,11 @@ "condition": "config.unix && features.system-freetype && libs.webengine-freetype", "output": [ "privateFeature" ] }, + "webengine-qt-freetype" : { + "label": "qtfreetype", + "condition": "config.static && !features.system-freetype && features.freetype", + "output": [ "privateFeature" ] + }, "webengine-system-libvpx" : { "label": "libvpx", "condition": "config.unix && libs.webengine-libvpx", @@ -787,6 +812,17 @@ "webengine-system-harfbuzz", "webengine-system-freetype" ] + }, + { + "section": "Qt 3rdparty libs", + "condition": "config.static", + "entries": [ + "webengine-qt-freetype", + "webengine-qt-harfbuzz", + "webengine-qt-png", + "webengine-qt-jpeg", + "webengine-qt-zlib" + ] } ] } |