Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/virtualkeyboard/basic/basic.pro
	src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf

Change-Id: I92b07ae67779bba37141408e28c6f67e1731383a

16 files changed, 13 insertions, 12 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 7664d615..9bcb2294 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += quick/enterprise/virtualkeyboard
+SUBDIRS += virtualkeyboard
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml
index 50498aa6..55ab716c 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard-b2qt.qml
+++ b/examples/virtualkeyboard/basic/basic-b2qt.qml
@@ -33,8 +33,9 @@ import QtQuick.Enterprise.VirtualKeyboard 2.0
 import "content"
 
 Item {
-    implicitWidth: virtualKeyboard.implicitHeight
-    implicitHeight: virtualKeyboard.implicitWidth
+    width: 1280
+    height: 720
+
     Item {
         id: appContainer
         width: Screen.width < Screen.height ? parent.height : parent.width
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro b/examples/virtualkeyboard/basic/basic.pro
index 0f71e0eb..0218a34a 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro
+++ b/examples/virtualkeyboard/basic/basic.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = virtualkeyboard
+TARGET = basic
 QT += qml quick
 SOURCES += main.cpp
 CONFIG += link_pkgconfig
@@ -8,15 +8,15 @@ static {
     QTPLUGIN += qtvirtualkeyboardplugin
 }
 
-target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
 INSTALLS += target
 
 RESOURCES += \
     demo.qrc
 
 OTHER_FILES += \
-    VirtualKeyboard.qml \
-    VirtualKeyboard-b2qt.qml \
+    basic.qml \
+    basic-b2qt.qml \
     content/AutoScroller.qml \
     content/HandwritingModeButton.qml \
     content/ScrollBar.qml \
@@ -30,7 +30,7 @@ disable-xcb {
 }
 
 disable-desktop|android-no-sdk|!isEmpty(CROSS_COMPILE)|qnx {
-    DEFINES += MAIN_QML=\\\"VirtualKeyboard-b2qt.qml\\\"
+    DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\"
 } else {
-    DEFINES += MAIN_QML=\\\"VirtualKeyboard.qml\\\"
+    DEFINES += MAIN_QML=\\\"basic.qml\\\"
 }
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml b/examples/virtualkeyboard/basic/basic.qml
index f1d67756..f1d67756 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/VirtualKeyboard.qml
+++ b/examples/virtualkeyboard/basic/basic.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/AutoScroller.qml b/examples/virtualkeyboard/basic/content/AutoScroller.qml
index c863e96a..c863e96a 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/AutoScroller.qml
+++ b/examples/virtualkeyboard/basic/content/AutoScroller.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Active.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg
index ef108358..ef108358 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Active.svg
+++ b/examples/virtualkeyboard/basic/content/FloatingButton_Active.svg
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Available.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg
index 1178c8c6..1178c8c6 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Available.svg
+++ b/examples/virtualkeyboard/basic/content/FloatingButton_Available.svg
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Unavailable.svg b/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg
index d8149b53..d8149b53 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/FloatingButton_Unavailable.svg
+++ b/examples/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/HandwritingModeButton.qml b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml
index 6b2f9dbc..6b2f9dbc 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/HandwritingModeButton.qml
+++ b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/ScrollBar.qml b/examples/virtualkeyboard/basic/content/ScrollBar.qml
index db0e47b3..db0e47b3 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/ScrollBar.qml
+++ b/examples/virtualkeyboard/basic/content/ScrollBar.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml b/examples/virtualkeyboard/basic/content/TextArea.qml
index b862fd55..b862fd55 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextArea.qml
+++ b/examples/virtualkeyboard/basic/content/TextArea.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml b/examples/virtualkeyboard/basic/content/TextBase.qml
index 124e8087..124e8087 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextBase.qml
+++ b/examples/virtualkeyboard/basic/content/TextBase.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml b/examples/virtualkeyboard/basic/content/TextField.qml
index 3228b256..3228b256 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/content/TextField.qml
+++ b/examples/virtualkeyboard/basic/content/TextField.qml
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/demo.qrc b/examples/virtualkeyboard/basic/demo.qrc
index 92258cbb..6bd24d05 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/demo.qrc
+++ b/examples/virtualkeyboard/basic/demo.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>VirtualKeyboard-b2qt.qml</file>
-        <file>VirtualKeyboard.qml</file>
         <file>content/AutoScroller.qml</file>
         <file>content/ScrollBar.qml</file>
         <file>content/TextArea.qml</file>
@@ -11,5 +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-b2qt.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/main.cpp b/examples/virtualkeyboard/basic/main.cpp
index 883808b8..883808b8 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/main.cpp
+++ b/examples/virtualkeyboard/basic/main.cpp
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro b/examples/virtualkeyboard/virtualkeyboard.pro
index 8c37ce46..3ea78202 100644
--- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard.pro
+++ b/examples/virtualkeyboard/virtualkeyboard.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    virtualkeyboard
+    basic