diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:33:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:33:04 +0200 |
| commit | 94c78ddf7ddea751a8e816d26f341d54184056c6 (patch) | |
| tree | 08027cd798e1a7327e54aa1acab4d5baaab3cc7a /.qmake.conf | |
| parent | c6713e212ef0b97c45d6466b73220567e94a05f1 (diff) | |
| parent | 7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 (diff) | |
| download | qtquickcontrols-94c78ddf7ddea751a8e816d26f341d54184056c6.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions