aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-29 01:02:07 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-29 01:02:07 +0200
commitdd333172e2ade1db6d0af72b4ed44262c2b4d8c7 (patch)
tree16301a9b938826cf4b78b751907378d96423c5d0 /src/quick/items/qquickitem.cpp
parent3d266d90cb920375bb856844baea290e52355aad (diff)
parentffeaac704efc9eb85464d0a401d98e28991ec4d3 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
0 files changed, 0 insertions, 0 deletions