diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:01:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:01:04 +0100 |
| commit | 11d7788c18bf062c204782b3661e67b45e818819 (patch) | |
| tree | 7e6df60892757c060ecf9d2698b893f8b93315e7 /configure.json | |
| parent | b3c0e9afa0041d4d45e47880732deda1dd1013b9 (diff) | |
| parent | 3162345670ffe67a71a62abaeda0d8eb8ad0682e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I69238f23882deebeaad46e4fdcf899ab22cc2b8f
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 105b51a81c..30c5dd0420 100644 --- a/configure.json +++ b/configure.json @@ -1481,6 +1481,10 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "type": "error", "condition": "!features.stl", "message": "Qt requires a compliant STL library." + }, + { + "type": "emccVersion", + "condition": "config.wasm" } ], |