diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:41 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:41 +0100 |
commit | 8dbb5d994e31bf304c12656171e1d7728650ee03 (patch) | |
tree | a4f70ded858acd924cc3e6b3aaa5ad85bc80e8e6 /.qmake.conf | |
parent | 1e6db9fc4f9cfd52ea96b1b8576ba19a1442638e (diff) | |
parent | 32831880512272968e26ed6a85a5cd98ecbda3b6 (diff) | |
download | qtquickcontrols-8dbb5d994e31bf304c12656171e1d7728650ee03.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I4a76c586b2e5e49616627c306dd345bdeee64b62
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions