summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-21 09:31:21 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-21 09:31:21 +0200
commit41bc6f40fb03d7856d7cd190d81c6d06b1a67b3b (patch)
tree6967a89e3a7f2ad86481f75e6804690524972070 /src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
parent3e6089b695489d5ba513723230a54b4b5e8349ae (diff)
parent3a6d8df5219653b043bd642668cee193f563ec84 (diff)
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp')
0 files changed, 0 insertions, 0 deletions