diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:18:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:37:04 +0100 |
commit | 8ec2403603f82e7a0d43b4de04c97ef1c7f1ad35 (patch) | |
tree | d7099d5a7cf813f378064ef0348647f4e68b2692 /tools/qmlplugindump/main.cpp | |
parent | 15525d2a309a6028d548797bc777e38905f36c46 (diff) | |
parent | 454676a8745a7334539449562a5fda47db2fc2ca (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.cpp
src/qml/compiler/qv4instr_moth.cpp
src/quick/handlers/qquicksinglepointhandler_p.h
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/context2d/qquickcontext2d.cpp
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4
Diffstat (limited to 'tools/qmlplugindump/main.cpp')
0 files changed, 0 insertions, 0 deletions