Merge remote-tracking branch 'origin/5.10' into 5.11

Change-Id: Id2c6a6993190c1860645bf3fc9952010f9f7bdc7

src/src.pro

@@ -35,4 +35,5 @@ t9write {
 SUBDIRS += \
     virtualkeyboard \
     virtualkeyboard/import \
+    virtualkeyboard/settings \
     virtualkeyboard/styles

src/virtualkeyboard/settings/qmldir

+module QtQuick.VirtualKeyboard.Settings
+typeinfo plugins.qmltypes
+depends QtQuick 2.8
+depends QtQuick.VirtualKeyboard 2.1

src/virtualkeyboard/settings/settings.pro

+TARGETPATH = QtQuick/VirtualKeyboard/Settings
+QML_FILES += plugins.qmltypes
+
+load(qml_module)
+
+# qmltypes target
+!cross_compile:if(build_pass|!debug_and_release) {
+    qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
+
+    qmltypes.commands = QT_IM_MODULE=qtvirtualkeyboard $$QMLPLUGINDUMP -defaultplatform -nonrelocatable QtQuick.VirtualKeyboard.Settings 2.1 > $$PWD/plugins.qmltypes
+    QMAKE_EXTRA_TARGETS += qmltypes
+}