summaryrefslogtreecommitdiff
path: root/src/controls/plugin.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:05:10 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:05:10 +0200
commit052eb295cd5c0d7aa101e7fe30e53ecf3f894361 (patch)
tree5b6002f55c0d93d859126bf89399a3eede4600d0 /src/controls/plugin.h
parent54a1a94be3b89cbf3d288e0fddf0fb14798fce80 (diff)
parent340e1d21a5ad3976f9131641da9cbdc7b3fbacb4 (diff)
downloadqtquickcontrols-052eb295cd5c0d7aa101e7fe30e53ecf3f894361.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If2e68359e05a5be8db3330ba9af6245c50eab8ba
Diffstat (limited to 'src/controls/plugin.h')
0 files changed, 0 insertions, 0 deletions