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 | |
| 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')
| -rw-r--r-- | examples/virtualkeyboard/basic/Basic.qml (renamed from examples/virtualkeyboard/basic/basic.qml) | 0 | ||||
| -rw-r--r-- | examples/virtualkeyboard/basic/basic-b2qt.qml | 2 | ||||
| -rw-r--r-- | examples/virtualkeyboard/basic/basic.pro | 4 | ||||
| -rw-r--r-- | examples/virtualkeyboard/basic/demo.qrc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/virtualkeyboard/basic/basic.qml b/examples/virtualkeyboard/basic/Basic.qml index c8b9ad41..c8b9ad41 100644 --- a/examples/virtualkeyboard/basic/basic.qml +++ b/examples/virtualkeyboard/basic/Basic.qml 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 diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro index e30337c4..2e0c6f68 100644 --- a/examples/virtualkeyboard/basic/basic.pro +++ b/examples/virtualkeyboard/basic/basic.pro @@ -15,7 +15,7 @@ RESOURCES += \ demo.qrc OTHER_FILES += \ - basic.qml \ + Basic.qml \ basic-b2qt.qml \ content/AutoScroller.qml \ content/HandwritingModeButton.qml \ @@ -32,5 +32,5 @@ disable-xcb { disable-desktop|!isEmpty(CROSS_COMPILE)|qnx { DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" } else { - DEFINES += MAIN_QML=\\\"basic.qml\\\" + DEFINES += MAIN_QML=\\\"Basic.qml\\\" } diff --git a/examples/virtualkeyboard/basic/demo.qrc b/examples/virtualkeyboard/basic/demo.qrc index 6bd24d05..5bcafc71 100644 --- a/examples/virtualkeyboard/basic/demo.qrc +++ b/examples/virtualkeyboard/basic/demo.qrc @@ -9,7 +9,7 @@ <file>content/FloatingButton_Active.svg</file> <file>content/FloatingButton_Available.svg</file> <file>content/FloatingButton_Unavailable.svg</file> - <file>basic.qml</file> + <file>Basic.qml</file> <file>basic-b2qt.qml</file> </qresource> </RCC> |