diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 11:14:18 +0200 |
| commit | 17548a0b1965074fff5b3036f77ea8261a132c92 (patch) | |
| tree | 25f1ec36d43d0e7ab4f3110929a2c3b39329a13e /examples/virtualkeyboard/basic/basic-b2qt.qml | |
| parent | f58add00ffa5dd5b3fd7bc31bf3cacc452cb8e5c (diff) | |
| parent | e99680e6577a52fb07096eb45095125bb90cf980 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/virtualkeyboard/lipisharedrecognizer.cpp
src/virtualkeyboard/styles/styles.pro
src/virtualkeyboard/virtualkeyboard.pro
Change-Id: I150f2ad265f8a7bd07be1d9415cdad854e200e87
Diffstat (limited to 'examples/virtualkeyboard/basic/basic-b2qt.qml')
| -rw-r--r-- | examples/virtualkeyboard/basic/basic-b2qt.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index 91ff8558..10e5c780 100644 --- a/examples/virtualkeyboard/basic/basic-b2qt.qml +++ b/examples/virtualkeyboard/basic/basic-b2qt.qml @@ -42,7 +42,7 @@ Item { height: Screen.width < Screen.height ? parent.width : parent.height anchors.centerIn: parent rotation: Screen.width < Screen.height ? 90 : 0 - VirtualKeyboard { + Basic { id: virtualKeyboard anchors.left: parent.left anchors.top: parent.top |