diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 15:13:30 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-08-30 06:48:33 +0000 |
| commit | 29c0377f07f4942f9957ea87d59c252148dc9e5b (patch) | |
| tree | cb79a59b6c47305ca024675cc1325ed0a6be8aac /src/corelib/configure.json | |
| parent | 707ae5b66774a2ed4713da3b8fa69c1d002c3beb (diff) | |
WebAssembly for QtBase
This is the squashed diff from wip/webassembly to dev.
Done-with: Peng Wu <peng.wu@intopalo.com>
Done-with: Sami Enne <sami.enne@intopalo.com>
Done-with: Morten Johan Sørvig <morten.sorvig@qt.io>
Started-by: Andrew Knight <andrew.knight@intopalo.com>
Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 18fc22f18f..183eb3a13e 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -481,7 +481,7 @@ }, "eventfd": { "label": "eventfd", - "condition": "tests.eventfd", + "condition": "!config.wasm && tests.eventfd", "output": [ "feature" ] }, "futimens": { @@ -592,7 +592,7 @@ "poll_ppoll": { "label": "Native ppoll()", "emitIf": "!config.win32", - "condition": "tests.ppoll", + "condition": "!config.wasm && tests.ppoll", "output": [ "privateFeature" ] }, "poll_pollts": { |