diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-04 15:32:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-04 15:32:34 +0100 |
| commit | a503bf54705d89204007e8f887b668fe5ef519fc (patch) | |
| tree | b2d1a452da39450eac78a1aeb1df116a73f64b23 /configure.json | |
| parent | e65c43fd0ffa57248e7d750570b7deae171a82f5 (diff) | |
| parent | 1f87fb359fdff14e42662384a9c8a0bcb3837671 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev.
src/widgets/kernel/qapplication.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01
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 92def2b1c4..4d8bf0f33a 100644 --- a/configure.json +++ b/configure.json @@ -1480,6 +1480,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" } ], |