diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:08:17 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-21 03:08:17 +0100 |
commit | c678a9eda06d0b5f0bc01835f6dcdb9262b299f5 (patch) | |
tree | dd51859252cee8eb583aa4687d1700538cc218f2 /.qmake.conf | |
parent | 8c31769dbb1cfa93416260c2ddcd712587187c80 (diff) | |
parent | cf5d13803759e5186d24281d95e941ee3ade54b1 (diff) | |
download | qtquickcontrols-c678a9eda06d0b5f0bc01835f6dcdb9262b299f5.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I21980a5e2c81f825b681a18e46d98a67e15d9204
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions