diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-05 09:28:48 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-05 10:03:24 +0200 |
commit | f3c816befee4d0cd522e503b4eb04e1b3a892a6d (patch) | |
tree | cf283c7a44bdfc4113d48ec12daa0c3d711aae99 /src/gui/text/qtextlayout.h | |
parent | 4d7271087e84096abd75fa806bea234daee0cd94 (diff) | |
parent | f3b28e80211881ab78879eb5acbf5de5d1b1e38c (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/gui/text/qtextlayout.h')
0 files changed, 0 insertions, 0 deletions