diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:52 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:52 +0100 |
commit | d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2 (patch) | |
tree | 190da6a7f59e2220aa999c36cf2bee0d0f30a225 /.qmake.conf | |
parent | 6b62b506d6eb06271e082dcedaf75fd588a5b17c (diff) | |
parent | 46425199ebcdd4cb9facb471f67e17a941ca103f (diff) | |
download | qtquickcontrols-d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions