diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:03 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:04:03 +0100 |
commit | 06230d22488796d92ea130e985d1e0ee2ed05199 (patch) | |
tree | 85829879b207a1a53db04e877ec2ae66294009db /.qmake.conf | |
parent | 8ab1765b0f9640eb410864971cb4336adc7b30ab (diff) | |
parent | 6793a0a907f3aa92f8f8bd5448505c152d0e3a3d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I6c201769561f53d88c89f75cce7d9a7b2643d2f6
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions