aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickframe_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-17 03:02:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-17 03:02:22 +0200
commitdea650f0ad8b33fafc2d6fd30733466602aaafee (patch)
treeeb560f3b5835f8cfc6c8f7474f8895609c1ea904 /src/quicktemplates2/qquickframe_p.h
parent77e577592e64ab9b099de09c281140c60c898df7 (diff)
parente0b2a30357a6fbb2d52fcba69f0a5059d3b065b8 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/quicktemplates2/qquickframe_p.h')
0 files changed, 0 insertions, 0 deletions