diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-29 01:02:07 +0200 |
commit | dd333172e2ade1db6d0af72b4ed44262c2b4d8c7 (patch) | |
tree | 16301a9b938826cf4b78b751907378d96423c5d0 /src/quick/items/qquickitem.cpp | |
parent | 3d266d90cb920375bb856844baea290e52355aad (diff) | |
parent | ffeaac704efc9eb85464d0a401d98e28991ec4d3 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I800f39ea59efd6049d3226ec27b8ecb3f6e9ae28
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
0 files changed, 0 insertions, 0 deletions