diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-22 12:46:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-22 10:47:53 +0000 |
| commit | 94b02f6cb20fcb597416a46f7e2defced39fb774 (patch) | |
| tree | fea5c0174b3e9c53dcfea411660cd43c6f8b512e /src/testlib/doc/snippets/code | |
| parent | a15c7260cc83707dcdd05d7d9c23317536601fdc (diff) | |
| parent | e03a3882bea83d19879b30e312cc1d24520ed540 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15.0
This reverts commit 3a6d8df5219653b043bd642668cee193f563ec84.
That change is only for 5.14.
Conflicts:
src/plugins/platforms/wasm/qwasmeventtranslator.cpp
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmopenglcontext.cpp
src/plugins/platforms/wasm/qwasmscreen.cpp
Change-Id: I2d845c795a683e1542201cfb6fdd185fec2b17ab
Diffstat (limited to 'src/testlib/doc/snippets/code')
0 files changed, 0 insertions, 0 deletions