summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocumentlayout.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-14 01:00:09 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-14 01:00:09 +0200
commit1632786f00875d23c7d111cbb29dedaa35c1c8c2 (patch)
treef22a5bca4e8ec6f513ca4c9d83fc8c94594ec1f1 /src/gui/text/qtextdocumentlayout.cpp
parentdf9f9fb368cc2dc17c57030e1df51804c2f2265d (diff)
parent2a9cf3aeab8927d73adc3d63fc7bf97e0edda41a (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
0 files changed, 0 insertions, 0 deletions