diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /configure.json | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 3702c24f63..522bd34e9b 100644 --- a/configure.json +++ b/configure.json @@ -582,7 +582,7 @@ "shared": { "label": "Building shared libraries", "autoDetect": "!config.uikit", - "condition": "!config.integrity", + "condition": "!config.integrity && !config.wasm", "output": [ "shared", "publicFeature", @@ -1119,6 +1119,7 @@ "label": "Thread support", "purpose": "Provides QThread and related classes.", "section": "Kernel", + "condition": "!config.wasm", "output": [ "publicFeature" ] }, "future": { |