diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-29 01:00:09 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-29 13:31:19 +0000 |
commit | a4fe2d92099e33da39ad1216063a5869990eeab2 (patch) | |
tree | c7d39d2a43929cbabc1d636cd9a09e55ece9243a /tests/manual | |
parent | 4b1c40570300248a7a7744aa7ddf8e77457bdc2b (diff) | |
parent | deac8afcbf28ebe621ec3b8495ca1c9ad76843a5 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
Change-Id: I133bfd4bd9dd6f704252c956c90f05e8a8a40d6a
Diffstat (limited to 'tests/manual')
0 files changed, 0 insertions, 0 deletions