summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-16 18:18:29 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-09-16 18:18:29 +0000
commit6b9c57f8cd3df65702db327616913fa9d8172237 (patch)
tree087d7035f7f722279c35f28f7f65f508bdc157f6 /src/plugins/platforminputcontexts
parent8a2401bd45bb5991cf4c6a69539cb58f72e19994 (diff)
parent59b275b2842b33e6e86233261fb921747c11cc54 (diff)
Merge "Merge remote-tracking branch 'origin/5.6.2' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/plugins/platforminputcontexts')
0 files changed, 0 insertions, 0 deletions