diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 03:02:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 03:02:04 +0200 |
| commit | 7c549d3d786326e3c88f701d50be8fedccf17a12 (patch) | |
| tree | 9538bd874c1acc836f0fa73f85491cc973f95469 /.qmake.conf | |
| parent | 1f57d5a56862164ef37f23454a6984fc9fb485b6 (diff) | |
| parent | fba7e3cf5c8ad287ceaaeb381989159d8baa96ec (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ibe03fb4e1d949980c012e86599fe65c631c62fbf
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions