118 lines
5.4 KiB
Text
118 lines
5.4 KiB
Text
Index: src/buildtools/configure.json
|
|
--- src/buildtools/configure.json.orig
|
|
+++ src/buildtools/configure.json
|
|
@@ -122,6 +122,7 @@
|
|
},
|
|
"webengine-minizip": {
|
|
"label": "minizip",
|
|
+ "autoDetect": "false",
|
|
"sources": [
|
|
{ "type": "pkgConfig", "args": "minizip" }
|
|
]
|
|
@@ -295,9 +296,9 @@
|
|
"label": "system ninja",
|
|
"type": "detectNinja"
|
|
},
|
|
- "webengine-python2": {
|
|
- "label": "python2",
|
|
- "type": "detectPython2",
|
|
+ "webengine-python": {
|
|
+ "label": "python",
|
|
+ "type": "detectPython",
|
|
"log": "location"
|
|
},
|
|
"webengine-winversion": {
|
|
@@ -364,47 +365,12 @@
|
|
"features": {
|
|
"webengine-core-support": {
|
|
"label": "Support Qt WebEngine Core",
|
|
- "condition": "(config.linux || config.win32 || config.macos)
|
|
- && !config.static
|
|
- && module.gui
|
|
- && features.webengine-submodule
|
|
- && features.webengine-nowhitespace
|
|
- && !features.webengine-no-platform-support
|
|
- && features.webengine-arch-support
|
|
- && features.webengine-gperf
|
|
- && features.webengine-bison
|
|
- && features.webengine-flex
|
|
- && features.webengine-python2
|
|
- && features.webengine-nodejs
|
|
- && (!config.sanitizer || features.webengine-sanitizer)
|
|
- && (!config.linux || features.pkg-config)
|
|
- && (!config.linux || features.webengine-host-pkg-config)
|
|
- && (!config.linux || features.webengine-system-glibc)
|
|
- && (!config.linux || features.webengine-system-khr)
|
|
- && (!config.linux || features.webengine-system-nss)
|
|
- && (!config.linux || features.webengine-system-dbus)
|
|
- && (!config.linux || features.webengine-system-fontconfig)
|
|
- && (!config.linux || !features.pkg-config || !features.xcb || features.webengine-ozone-x11)
|
|
- && (!config.win32 || features.webengine-win-compiler64)
|
|
- && (!config.win32 || features.webengine-winversion)",
|
|
+ "condition": "(config.unix || config.win32 || config.macos)",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
"webengine-qtpdf-support": {
|
|
"label": "Support Qt Pdf",
|
|
- "condition": "(config.linux || config.win32 || config.macos || config.ios)
|
|
- && module.gui
|
|
- && features.webengine-submodule
|
|
- && features.webengine-nowhitespace
|
|
- && !features.webengine-no-platform-support
|
|
- && features.webengine-arch-support
|
|
- && features.webengine-gperf
|
|
- && features.webengine-bison
|
|
- && features.webengine-flex
|
|
- && features.webengine-python2
|
|
- && (!config.sanitizer || features.webengine-sanitizer)
|
|
- && (!config.linux || features.pkg-config)
|
|
- && (!config.linux || features.webengine-host-pkg-config)
|
|
- && (!config.win32 || features.webengine-winversion)",
|
|
+ "condition": "(config.unix || config.win32 || config.macos || config.ios)",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
"build-qtwebengine-core": {
|
|
@@ -423,12 +389,12 @@
|
|
"autoDetect": "features.private_tests",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
- "webengine-python2": {
|
|
- "label": "python2",
|
|
- "condition": "tests.webengine-python2",
|
|
+ "webengine-python": {
|
|
+ "label": "python",
|
|
+ "condition": "tests.webengine-python",
|
|
"output": [
|
|
"privateFeature",
|
|
- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
|
|
+ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" }
|
|
]
|
|
},
|
|
"webengine-gperf": {
|
|
@@ -519,7 +485,7 @@
|
|
},
|
|
"webengine-system-glibc": {
|
|
"label": "glibc",
|
|
- "condition": "config.linux && tests.webengine-glibc",
|
|
+ "condition": "config.unix && tests.webengine-glibc",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
"webengine-system-x11" : {
|
|
@@ -639,7 +605,7 @@
|
|
},
|
|
"webengine-system-ffmpeg": {
|
|
"label": "ffmpeg",
|
|
- "autoDetect": "false",
|
|
+ "autoDetect": "true",
|
|
"condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
@@ -708,7 +674,7 @@
|
|
},
|
|
"webengine-arm-thumb": {
|
|
"label": "Thumb instruction set",
|
|
- "condition": "config.linux && arch.arm && tests.webengine-arm-thumb",
|
|
+ "condition": "config.unix && arch.arm && tests.webengine-arm-thumb",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
"webengine-sanitizer" : {
|