diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-06-17 13:33:57 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-06-17 13:33:57 +0200 |
commit | be49d3ffd3175903e47fa94c674eddcfb960b0a7 (patch) | |
tree | 4eef200417a9df343e45dd5af6643d95b97b196a /.qmake.conf | |
parent | 40f03dcd25db6fa4174c5ce493c1727f1bd0274f (diff) | |
parent | 498d1d9af50afc4af0e18f3d15df82aa08b5f99c (diff) |
Merge remote-tracking branch 'origin/5.12.9' into 5.12
Change-Id: Ica454385ca661482010646aa6145d1da69b3f9e7
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions