summaryrefslogtreecommitdiff
path: root/src/dialogs/plugin.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-18 06:44:45 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-18 06:44:45 +0200
commit5ab01d7dc4b5a5d180885e3bc2a82267f9fcf3ae (patch)
tree6f2b46092fb6909e486864924f15e3c629a53123 /src/dialogs/plugin.cpp
parent4cda4427b6a2e07dd406362cf7b643b971706b2c (diff)
parent0689a8256c0a21087c01fff3998fd3b606a5ac4c (diff)
downloadqtquickcontrols-5ab01d7dc4b5a5d180885e3bc2a82267f9fcf3ae.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I00b66b03717563bb700f8a73c3bc295a55ac8c6a
Diffstat (limited to 'src/dialogs/plugin.cpp')
0 files changed, 0 insertions, 0 deletions