blob: 0c30b9f7d87bf2e31326dbd05ed0decc5d29a0e2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- src/buildtools/configure.json.orig 2020-11-07 01:22:36 UTC
+++ src/buildtools/configure.json
@@ -362,7 +362,7 @@
"features": {
"webengine-core-support": {
"label": "Support Qt WebEngine Core",
- "condition": "(config.linux || config.win32 || config.macos)
+ "condition": "(config.unix || config.win32 || config.macos)
&& !config.static
&& module.gui
&& features.webengine-submodule
@@ -374,21 +374,21 @@
&& features.webengine-flex
&& features.webengine-python2
&& (!config.sanitizer || features.webengine-sanitizer)
- && (!config.linux || features.pkg-config)
- && (!config.linux || features.webengine-host-pkg-config)
+ && (!config.unix || features.pkg-config)
+ && (!config.unix || 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.unix || features.webengine-system-khr)
+ && (!config.unix || features.webengine-system-nss)
+ && (!config.unix || features.webengine-system-dbus)
+ && (!config.unix || features.webengine-system-fontconfig)
+ && (!config.unix || !features.pkg-config || !features.xcb || features.webengine-ozone-x11)
&& (!config.win32 || features.webengine-win-compiler64)
&& (!config.win32 || features.webengine-winversion)",
"output": [ "privateFeature" ]
},
"webengine-qtpdf-support": {
"label": "Support Qt Pdf",
- "condition": "(config.linux || config.win32 || config.macos || config.ios)
+ "condition": "(config.unix || config.win32 || config.macos || config.ios)
&& module.gui
&& features.webengine-submodule
&& features.webengine-nowhitespace
@@ -399,8 +399,8 @@
&& features.webengine-flex
&& features.webengine-python2
&& (!config.sanitizer || features.webengine-sanitizer)
- && (!config.linux || features.pkg-config)
- && (!config.linux || features.webengine-host-pkg-config)
+ && (!config.unix || features.pkg-config)
+ && (!config.unix || features.webengine-host-pkg-config)
&& (!config.win32 || features.webengine-winversion)",
"output": [ "privateFeature" ]
},
|
