diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-25 10:50:14 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-25 10:50:15 +0200 |
commit | e1a6475a2a3ea46b2afbc2f154c18b255466dad7 (patch) | |
tree | 6e400e8def7a391c05d9b6ce174f1f6490544d18 /src/quicktemplates2/qquickitemdelegate_p_p.h | |
parent | b09cf7966fdf8a6949acd912cfb054556d155ee8 (diff) | |
parent | 5ca18a3f21083151b771f0efa2a2605f183c8166 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibf39232616ea6ef67242b70011aa683ce8dc0b4f
Diffstat (limited to 'src/quicktemplates2/qquickitemdelegate_p_p.h')
0 files changed, 0 insertions, 0 deletions