diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:26 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:26 +0100 |
commit | d3fb65b35356c41b330974dc74aa6c4254739802 (patch) | |
tree | a072cc22c848b4631978d848edf1c99765c371c5 /tests | |
parent | 37233436a5d01405dc93ebcfc90cb1a77ce206c1 (diff) | |
parent | b6a72a463203cf8cdd03cd9ea135ea396ec2ed42 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I0a185faec24b58beaa2151f49b094d8ce6747f36
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions