summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-30 01:00:19 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-30 01:00:19 +0200
commit07e92611050f78dae93bcd362112efd8efa7b41e (patch)
tree6951f77a6344436150c4f83f407e09d946f2c6c3 /src/widgets/widgets/qtextedit.cpp
parent69e68218e5082166d5c4ab1903fbacde00418a1c (diff)
parentcaa598c843eb27fd0c645e62723fd2d4e3e12f60 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
0 files changed, 0 insertions, 0 deletions