diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 09:22:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 09:22:51 +0100 |
| commit | 9ba8b807d002e0b93afe5e08221cf6c38b0055fb (patch) | |
| tree | 396315936ca29687fffa3b40eff8a62c70f76b42 | |
| parent | ebb48fa6be3aeae6915da7ec30311a0e439a0720 (diff) | |
| parent | b255d8923ba5eb8435485c1fab3f8d563ac4837c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Conflicts:
.qmake.conf
Change-Id: If0a9a36e4d9fe5151014dded02559ce60f2eae32
0 files changed, 0 insertions, 0 deletions