diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-11 19:02:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-11 19:02:37 +0200 |
commit | 3a1a7492499ce637247fa0733d83df93d4c02b56 (patch) | |
tree | 6d9650770314d70d3717e72c4670689eba984900 /src/imports/controls/qtquickcontrols2plugin.cpp | |
parent | a648eb96dbef983557ffb78618d63987c27390a6 (diff) | |
parent | b6e62658322fe2d23b5df9376484c3ad259d2bc6 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: If502b986cc8d6729ebea64cedfdf97b9b612e7c0
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
0 files changed, 0 insertions, 0 deletions