diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-12-15 14:53:51 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-12-15 14:53:51 +0100 |
| commit | 337aea7bc386d5e97825d27335d860fc88b2bee3 (patch) | |
| tree | 76d316a935755a922e6b7b998867c7cba90f0a94 /.qmake.conf | |
| parent | 57f42a11363cb61892937caa904c3f5c660cabeb (diff) | |
| parent | 730b2bd96e88fe63364c9f81e299555f0b1f0daa (diff) | |
| download | qtlocation-337aea7bc386d5e97825d27335d860fc88b2bee3.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions