diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 16:06:52 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 16:06:52 +0100 |
| commit | e67e97e9543eae2de42666eec3ff4d3cdca81db3 (patch) | |
| tree | dabfba5605c8aa99ad2b548f0ad95b02d4569cac /src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | |
| parent | 1ba0613309439f778b4b4e955131d80936490371 (diff) | |
| parent | ea873857fd7c92608bfa64d080dbdf9589ffa4b3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/virtualkeyboard/content/InputPanel.qml
Change-Id: I6839198e123f682a88132f8efbed0bdaf8835e7e
Diffstat (limited to 'src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf')
0 files changed, 0 insertions, 0 deletions