summaryrefslogtreecommitdiff
path: root/src/controls/plugin.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-04 03:02:11 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-04 03:02:11 +0100
commit9c3f0688a549c0e57c08d4715b277e05e35849d9 (patch)
treef02cc978b28da29d916330944cd98c0c2572035d /src/controls/plugin.cpp
parent854d94008c519fd7eb1c0d47796640a95287b17c (diff)
parent50b6fb27458708a18f4114e3ebec0fa632b2659f (diff)
downloadqtquickcontrols-9c3f0688a549c0e57c08d4715b277e05e35849d9.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia88457c352f6d1019494dd5e34300d35062d5d15
Diffstat (limited to 'src/controls/plugin.cpp')
0 files changed, 0 insertions, 0 deletions