diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:04:15 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:04:16 +0100 |
commit | 1425995a8b0e7e35b90bf93c3f9d4fe4e7e2b887 (patch) | |
tree | 93f502f98f10c1a9bbb2339465ace9e045eb3156 /src/imports/controls/controls.pri | |
parent | b86d6b0b06db0eb978e2559745c48edb2ca876a7 (diff) | |
parent | 33966b5b9b026f24ac94c0905280deb4d004df81 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4ebc848bf78a74fb26a630d8a4839f104612ff74
Diffstat (limited to 'src/imports/controls/controls.pri')
0 files changed, 0 insertions, 0 deletions