diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 11:33:45 +0200 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-09-05 00:00:00 +0000 |
| commit | eb6201b2af725d64e5e92f19a512b1ff23ceba51 (patch) | |
| tree | 5ad1717b096f70b90a6ef031de8e5253d64361d8 /src/qml/configure.json | |
| parent | f5ad1a13e5ce9ce1389ea7731829ea455259a4db (diff) | |
WebAssembly for QtDeclarative
This is the squashed diff from wip/webassembly to 5.12.
Done-with: Lorn Potter <lorn.potter@gmail.com>
Change-Id: Ieef34accefef38018a66d3c39bfacb825af4bea6
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/qml/configure.json')
| -rw-r--r-- | src/qml/configure.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json index 481cc553ae..1e3ac65f2a 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -32,10 +32,8 @@ "section": "QML", "condition": [ "features.commandlineparser", - "features.localserver", - "features.process", "features.qml-debug", - "features.qml-network", + "features.qml-network && features.localserver", "features.xmlstreamwriter" ], "output": [ "privateFeature" ] @@ -46,7 +44,7 @@ "section": "QML", "condition": [ "features.commandlineparser", - "features.localserver", + "features.qml-network && features.localserver", "features.process", "features.qml-debug" ], |