aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickpopup.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-31 03:00:28 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-31 03:00:28 +0200
commitd055ee18b6012033de5138d429ddda5f421ddbc7 (patch)
treeb2cdba309bf929dd544f17d951019df37ef80213 /src/quicktemplates2/qquickpopup.cpp
parent6fcfb8da0ef6fd921aac524d1948ee4985392f6a (diff)
parent4df12d1ae59da65c1338b1e3b894e8f88beded0f (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
0 files changed, 0 insertions, 0 deletions