diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:07:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:07:04 +0100 |
| commit | e15365c065955e62053441f1b386492da231cc1d (patch) | |
| tree | 9069965e947f98612cf06fa8714dc88bf5597e14 | |
| parent | 045eeb8c929eeca306152670d001f1c6aff1ffb4 (diff) | |
| parent | 8476f66f413e89a4eb60f395a6e3840e0fe61a5f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I48da29c2b9751fea84e800be388fbaacf2f73268
0 files changed, 0 insertions, 0 deletions