diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/gui/configure.json | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index d2415f7d48..120539d277 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1302,7 +1302,7 @@ "label": "VNC", "section": "Platform plugins", "condition": [ - "config.unix && !config.android && !config.darwin", + "config.unix && !config.android && !config.darwin && !config.wasm", "features.regularexpression && features.network" ], "output": [ "privateFeature" ] |