diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-13 21:18:24 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-13 21:18:24 +0100 |
commit | 3d445e8b77b4017f55d5b1e0d8d141fbf9d28118 (patch) | |
tree | bdd82ebb9af825493aa69321a272b6b887eec649 /qtquickcontrols | |
parent | 9cb9e7654a8be9e53c52c1bf2ff46ad65ad1802a (diff) | |
parent | 355252621c4978f1b02899335d99fd9b371bb88e (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
Diffstat (limited to 'qtquickcontrols')
0 files changed, 0 insertions, 0 deletions