aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlobjectcreator_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-11 01:01:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-11 01:01:14 +0200
commit1909f99aac4a14d70ffcc004fc9e16c154485c25 (patch)
tree5f238ef9b34b802f1c97cffaba3ac06a013f0117 /src/qml/qml/qqmlobjectcreator_p.h
parentd73b4f6029f17bd6226a7b88e01c82db21bbc9f9 (diff)
parentbea81b724b3085a354da0b99c84339af8a795869 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
0 files changed, 0 insertions, 0 deletions