diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:27:52 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:27:52 +0200 |
commit | 69f4485c05c35d138f88938f58a30f10611ade9e (patch) | |
tree | 539d0aa8bc3666353b510a73b1a003e12a84d69f /.qmake.conf | |
parent | 1ba86278d3b82944e23b32e7be082ca60af54de8 (diff) | |
parent | 40b30b47188c20c6b64e6d0fe29f82a653836789 (diff) | |
download | qtx11extras-69f4485c05c35d138f88938f58a30f10611ade9e.tar.gz |
Merge remote-tracking branch 'origin/5.12.8' into 5.12
Change-Id: I5e44d35ab3ee209a935bc9f7dd3cd6ccff8861ea
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions