summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:42:57 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:42:57 +0200
commit2f325118f15bb4382e0031532137eaa3bf90d758 (patch)
tree77d68538cb4ea8734ae28116e8d3a7f771dc3607 /.qmake.conf
parent06229452ff948fd4e56cba886701c2ef9164eb1c (diff)
parent46bef1bf9b00727832cad35440c554f26e7457b9 (diff)
downloadqtlocation-2f325118f15bb4382e0031532137eaa3bf90d758.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I93fb67560ddc55a173416ded22400baf9ed906a4
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions