diff options
Diffstat (limited to 'src/corelib/configure.json')
-rw-r--r-- | src/corelib/configure.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index c5e0423273..a9025a2dd2 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -355,7 +355,7 @@ "std::future<int> f = std::async([]() { return 42; });", "(void)f.get();" ], - "qmake": "unix:LIBS += -lpthread" + "qmake": "unix:!vxworks:LIBS += -lpthread" } }, "cxx11_random": { @@ -727,8 +727,8 @@ }, "pcre2": { "label": "PCRE2", - "disable": "input.pcre == 'no' || input.pcre == 'system'", - "enable": "input.pcre == 'qt'", + "disable": "input.pcre == 'no'", + "enable": "input.pcre == 'qt' || features.system-pcre2", "output": [ "privateConfig" ] }, "system-pcre2": { @@ -1045,6 +1045,7 @@ "label": "QTimeZone", "purpose": "Provides support for time-zone handling.", "section": "Utilities", + "condition": "!config.wasm", "output": [ "publicFeature" ] }, "datetimeparser": { |