diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:34:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:34:18 +0100 |
| commit | 0b5e00c1052edfd896f98fd039686041917eed9a (patch) | |
| tree | 793b284accb9f087fc1bd0bd025ff8f81f1932f7 | |
| parent | 33047f5d7afd96a59a660c35f5fca4f694f91ae0 (diff) | |
| parent | 96448f719d32816f2af1461a08335cd3ed602db2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Ie6fb5a37701cd4ad437eb1a78425299707553f99
0 files changed, 0 insertions, 0 deletions