diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:31 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:32 +0200 |
commit | cdc6c2164a80311979a6c247d6fb77d436612e5f (patch) | |
tree | c0f15469440d862f0ff8e775d7804278811d0133 /src/qml/qml/qqmlplatform.cpp | |
parent | ac9046b074a60ab73d7e76a48b8c69f00db9cbd2 (diff) | |
parent | 7dc0de374300d66ed72f15820a4ebb78849ae0e7 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I5d7acb2a3883104d6002f147b58977ff58aa3383
Diffstat (limited to 'src/qml/qml/qqmlplatform.cpp')
0 files changed, 0 insertions, 0 deletions