diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:03:27 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 14:03:27 +0200 |
commit | c12af8832389785b8be7ffcdddcdb8480c1e124d (patch) | |
tree | 207a16cf235b699ada1aab6f8f00638648deab78 /.qmake.conf | |
parent | 1d5fa84ed9b450954a0d82e598570ec2107a5953 (diff) | |
parent | b12bc31046b29d67a59ab6b28cbc61e03dea0712 (diff) |
Merge remote-tracking branch 'origin/5.15.0' into 5.15
Change-Id: I6a0c63bffd901ec4190e3d348b21ce61444a459b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions