diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-01 14:31:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-01 14:50:06 +0100 |
| commit | 4b0a030cc9b9fa32383a43e2b971f05a536b8e7f (patch) | |
| tree | ac4738a7ae6ff491c3afa3171b27c9688635e58a /tools | |
| parent | e09519bad7ff266e466ea2d2d66187fbb13457f9 (diff) | |
| parent | 5d8d0d7068bc8498ea2a6a4c9bc16e0eeb92836c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/compiler/qv4codegen.cpp
Done-With: Erik Verbruggen <erik.verbruggen@qt.io>
Change-Id: I3ae3d64317e4f3fccba6605f4c6da15479ca75e0
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions