diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-21 21:16:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-22 10:10:23 +0000 |
| commit | 70a5ff099728b6f5e67723910180337b0f9bae17 (patch) | |
| tree | 51e1f0f65eb3d620024e8f1d09162152c7bb9187 /examples/widgets/graphicsview/boxes/basic.fsh | |
| parent | e10e5318bc02a48a866b76b6f0b7f268d16af642 (diff) | |
| parent | e03a3882bea83d19879b30e312cc1d24520ed540 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
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: Ib9151e199291fe6eb4151027b515393c05303d65
Diffstat (limited to 'examples/widgets/graphicsview/boxes/basic.fsh')
0 files changed, 0 insertions, 0 deletions