diff options
author | Liang Qi <liang.qi@qt.io> | 2018-05-10 12:38:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-05-10 12:38:49 +0200 |
commit | 1e5cf1852acb3babf2e335f0a83a3268a6495d4e (patch) | |
tree | 766fc43ded83682d5cbf0d8f6c5e000a3ba11cbc /qtdeclarative | |
parent | af8eab099309461267cb4cf84a0c819767a7cd0a (diff) | |
parent | f5ef436426990a56585adab2b939d2b6a083e0ca (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
Diffstat (limited to 'qtdeclarative')
0 files changed, 0 insertions, 0 deletions