diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:45 +0200 |
| commit | b4cdfc4a12d2b9ebc79fe17a2f1aff67bd940d71 (patch) | |
| tree | e7841ee2695a3ef180e186d2df971c8fc207d0f9 /src/quick/items/qquickitem.h | |
| parent | 650b5db06b057abe2db40fb8d56223e17ba8c06a (diff) | |
| parent | af002b8df9b084fd7f26e9eead9844aab36bdc4d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib31008e593442ca5813fb14ae6b02f7ab2577395
Diffstat (limited to 'src/quick/items/qquickitem.h')
0 files changed, 0 insertions, 0 deletions