diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:34 +0200 |
commit | 904aa66f6fadb908c311e7975780212cb6aff2e9 (patch) | |
tree | 83f701151e8cba608cada4fad91df80d3ff944a2 /.qmake.conf | |
parent | 874f8ef3b9fb9d80a2b05c264ca48464e31257e2 (diff) | |
parent | 845cd17a498d6008992b04ec4ca1984e6e73de3c (diff) | |
download | qtquickcontrols-904aa66f6fadb908c311e7975780212cb6aff2e9.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I69f231e99be0cc9a5600d95d1f53f70f5d55593e
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions