diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-09 01:00:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-09 01:00:48 +0200 |
| commit | 69b6845edbb43cf7000942d07f3a326383bdf6d2 (patch) | |
| tree | 58755c33dfb18a51d194d0f774b1deca6135ce4a /src/gui/text/qfont.h | |
| parent | e2ab24d36f31395c2239b49ac26f2266b69444bd (diff) | |
| parent | 8e5a2f63c3f6ee49d3f2e1985bf73de7769b0e72 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5cbfd39cf728036bbdfdeec8e8739568e0a3025b
Diffstat (limited to 'src/gui/text/qfont.h')
0 files changed, 0 insertions, 0 deletions