diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 14:02:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 14:02:02 +0200 |
| commit | 51c15a0f0f8ba127b667c4700e4e055c681077d3 (patch) | |
| tree | cd972bad814f685aba05e6dc6f596603875bd6f8 /.qmake.conf | |
| parent | 704e120042a504cfe5ff76f6f35133f47d067028 (diff) | |
| parent | 83c49ab485026f35fbd9b5f8242be967a0a24e8b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I600b0532f154dc885913f14a5d24261c0de93893
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions