48 files changed, 41 insertions, 369 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 8a13bdd..98be502 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = utils nativemedia
+SUBDIRS = utils nativemedia virtualkeyboard
diff --git a/virtualkeyboard/content/Keyboard.qml b/src/imports/virtualkeyboard/Keyboard.qml
index 52aa1a4..c626dbc 100644
--- a/virtualkeyboard/content/Keyboard.qml
+++ b/src/imports/virtualkeyboard/Keyboard.qml
@@ -62,6 +62,7 @@ Image {
     width: parent.width
     height: keyboardLayout.height+10
     y: Qt.inputMethod.visible ? parent.height - height : parent.height
+    visible: Qt.inputMethod.visible || Qt.inputMethod.animating;
 
     onLocaleChanged: InputContext.setLocale(locale)
     onUppercasedChanged: if (Qt.inputMethod.visible) InputContext.handleUppercasing(uppercased)
diff --git a/virtualkeyboard/content/components/AlternativeKeys.qml b/src/imports/virtualkeyboard/components/AlternativeKeys.qml
index 2465fa5..2465fa5 100644
--- a/virtualkeyboard/content/components/AlternativeKeys.qml
+++ b/src/imports/virtualkeyboard/components/AlternativeKeys.qml
diff --git a/virtualkeyboard/content/components/AutoScroller.qml b/src/imports/virtualkeyboard/components/AutoScroller.qml
index 35da95d..bbdc5da 100644
--- a/virtualkeyboard/content/components/AutoScroller.qml
+++ b/src/imports/virtualkeyboard/components/AutoScroller.qml
@@ -47,7 +47,6 @@ Item {
     property var inputItem: Qt.inputMethod.inputItem
 
     onInputItemChanged: {
-        flickable = null
         if (inputItem) {
             var parent_ = inputItem.parent
             while (parent_) {
diff --git a/virtualkeyboard/content/components/BackspaceKey.qml b/src/imports/virtualkeyboard/components/BackspaceKey.qml
index 760372c..760372c 100644
--- a/virtualkeyboard/content/components/BackspaceKey.qml
+++ b/src/imports/virtualkeyboard/components/BackspaceKey.qml
diff --git a/virtualkeyboard/content/components/BaseKey.qml b/src/imports/virtualkeyboard/components/BaseKey.qml
index 3f982c6..3f982c6 100644
--- a/virtualkeyboard/content/components/BaseKey.qml
+++ b/src/imports/virtualkeyboard/components/BaseKey.qml
diff --git a/virtualkeyboard/content/components/ChangeLanguageKey.qml b/src/imports/virtualkeyboard/components/ChangeLanguageKey.qml
index d6c89d3..d6c89d3 100644
--- a/virtualkeyboard/content/components/ChangeLanguageKey.qml
+++ b/src/imports/virtualkeyboard/components/ChangeLanguageKey.qml
diff --git a/virtualkeyboard/content/components/CharacterPreviewBubble.qml b/src/imports/virtualkeyboard/components/CharacterPreviewBubble.qml
index db0abdd..db0abdd 100644
--- a/virtualkeyboard/content/components/CharacterPreviewBubble.qml
+++ b/src/imports/virtualkeyboard/components/CharacterPreviewBubble.qml
diff --git a/virtualkeyboard/content/components/EnterKey.qml b/src/imports/virtualkeyboard/components/EnterKey.qml
index d321e34..d321e34 100644
--- a/virtualkeyboard/content/components/EnterKey.qml
+++ b/src/imports/virtualkeyboard/components/EnterKey.qml
diff --git a/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/imports/virtualkeyboard/components/HideKeyboardKey.qml
index 411307a..411307a 100644
--- a/virtualkeyboard/content/components/HideKeyboardKey.qml
+++ b/src/imports/virtualkeyboard/components/HideKeyboardKey.qml
diff --git a/virtualkeyboard/content/components/Icon.qml b/src/imports/virtualkeyboard/components/Icon.qml
index 089090d..089090d 100644
--- a/virtualkeyboard/content/components/Icon.qml
+++ b/src/imports/virtualkeyboard/components/Icon.qml
diff --git a/virtualkeyboard/content/components/InputEngine.qml b/src/imports/virtualkeyboard/components/InputEngine.qml
index b47f9ed..b47f9ed 100644
--- a/virtualkeyboard/content/components/InputEngine.qml
+++ b/src/imports/virtualkeyboard/components/InputEngine.qml
diff --git a/virtualkeyboard/content/components/Key.qml b/src/imports/virtualkeyboard/components/Key.qml
index b2d08b3..b2d08b3 100644
--- a/virtualkeyboard/content/components/Key.qml
+++ b/src/imports/virtualkeyboard/components/Key.qml
diff --git a/virtualkeyboard/content/components/NumberKey.qml b/src/imports/virtualkeyboard/components/NumberKey.qml
index f521f7f..f521f7f 100644
--- a/virtualkeyboard/content/components/NumberKey.qml
+++ b/src/imports/virtualkeyboard/components/NumberKey.qml
diff --git a/virtualkeyboard/content/components/PressedKey.qml b/src/imports/virtualkeyboard/components/PressedKey.qml
index 1f2925d..1f2925d 100644
--- a/virtualkeyboard/content/components/PressedKey.qml
+++ b/src/imports/virtualkeyboard/components/PressedKey.qml
diff --git a/virtualkeyboard/content/components/ShiftKey.qml b/src/imports/virtualkeyboard/components/ShiftKey.qml
index 16f463f..16f463f 100644
--- a/virtualkeyboard/content/components/ShiftKey.qml
+++ b/src/imports/virtualkeyboard/components/ShiftKey.qml
diff --git a/virtualkeyboard/content/components/SpaceKey.qml b/src/imports/virtualkeyboard/components/SpaceKey.qml
index d9a8a4e..d9a8a4e 100644
--- a/virtualkeyboard/content/components/SpaceKey.qml
+++ b/src/imports/virtualkeyboard/components/SpaceKey.qml
diff --git a/virtualkeyboard/content/components/SymbolModeKey.qml b/src/imports/virtualkeyboard/components/SymbolModeKey.qml
index d18447c..d18447c 100644
--- a/virtualkeyboard/content/components/SymbolModeKey.qml
+++ b/src/imports/virtualkeyboard/components/SymbolModeKey.qml
diff --git a/virtualkeyboard/content/images/arrow.png b/src/imports/virtualkeyboard/images/arrow.png
index 8d01aa2..8d01aa2 100644
--- a/virtualkeyboard/content/images/arrow.png
+++ b/src/imports/virtualkeyboard/images/arrow.png
diff --git a/virtualkeyboard/content/images/backspace.png b/src/imports/virtualkeyboard/images/backspace.png
index 4141872..4141872 100644
--- a/virtualkeyboard/content/images/backspace.png
+++ b/src/imports/virtualkeyboard/images/backspace.png
diff --git a/virtualkeyboard/content/images/enter.png b/src/imports/virtualkeyboard/images/enter.png
index c611ebe..c611ebe 100644
--- a/virtualkeyboard/content/images/enter.png
+++ b/src/imports/virtualkeyboard/images/enter.png
diff --git a/virtualkeyboard/content/images/hidekeyboard.png b/src/imports/virtualkeyboard/images/hidekeyboard.png
index aecdfe5..aecdfe5 100644
--- a/virtualkeyboard/content/images/hidekeyboard.png
+++ b/src/imports/virtualkeyboard/images/hidekeyboard.png
diff --git a/virtualkeyboard/content/images/keypad.png b/src/imports/virtualkeyboard/images/keypad.png
index fd8fa55..fd8fa55 100644
--- a/virtualkeyboard/content/images/keypad.png
+++ b/src/imports/virtualkeyboard/images/keypad.png
diff --git a/virtualkeyboard/content/images/shift.png b/src/imports/virtualkeyboard/images/shift.png
index eded926..eded926 100644
--- a/virtualkeyboard/content/images/shift.png
+++ b/src/imports/virtualkeyboard/images/shift.png
diff --git a/virtualkeyboard/content/images/space.png b/src/imports/virtualkeyboard/images/space.png
index 4a5e847..4a5e847 100644
--- a/virtualkeyboard/content/images/space.png
+++ b/src/imports/virtualkeyboard/images/space.png
diff --git a/virtualkeyboard/content/layouts/ar_AR.qml b/src/imports/virtualkeyboard/layouts/ar_AR.qml
index dc7c6d9..dc7c6d9 100644
--- a/virtualkeyboard/content/layouts/ar_AR.qml
+++ b/src/imports/virtualkeyboard/layouts/ar_AR.qml
diff --git a/virtualkeyboard/content/layouts/en_GB.qml b/src/imports/virtualkeyboard/layouts/en_GB.qml
index 5fb34be..5fb34be 100644
--- a/virtualkeyboard/content/layouts/en_GB.qml
+++ b/src/imports/virtualkeyboard/layouts/en_GB.qml
diff --git a/virtualkeyboard/content/layouts/fi_FI.qml b/src/imports/virtualkeyboard/layouts/fi_FI.qml
index db1d644..db1d644 100644
--- a/virtualkeyboard/content/layouts/fi_FI.qml
+++ b/src/imports/virtualkeyboard/layouts/fi_FI.qml
diff --git a/virtualkeyboard/content/layouts/numbers.qml b/src/imports/virtualkeyboard/layouts/numbers.qml
index 7d47066..7d47066 100644
--- a/virtualkeyboard/content/layouts/numbers.qml
+++ b/src/imports/virtualkeyboard/layouts/numbers.qml
diff --git a/virtualkeyboard/content/layouts/symbols.qml b/src/imports/virtualkeyboard/layouts/symbols.qml
index f4c8293..f4c8293 100644
--- a/virtualkeyboard/content/layouts/symbols.qml
+++ b/src/imports/virtualkeyboard/layouts/symbols.qml
diff --git a/virtualkeyboard/platforminputcontext/declarativeinputcontext.cpp b/src/imports/virtualkeyboard/platforminputcontext/declarativeinputcontext.cpp
index bf55f9b..bf55f9b 100644
--- a/virtualkeyboard/platforminputcontext/declarativeinputcontext.cpp
+++ b/src/imports/virtualkeyboard/platforminputcontext/declarativeinputcontext.cpp
diff --git a/virtualkeyboard/platforminputcontext/declarativeinputcontext.h b/src/imports/virtualkeyboard/platforminputcontext/declarativeinputcontext.h
index cb695ab..cb695ab 100644
--- a/virtualkeyboard/platforminputcontext/declarativeinputcontext.h
+++ b/src/imports/virtualkeyboard/platforminputcontext/declarativeinputcontext.h
diff --git a/virtualkeyboard/platforminputcontext/platforminputcontext.cpp b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.cpp
index a73a15a..a73a15a 100644
--- a/virtualkeyboard/platforminputcontext/platforminputcontext.cpp
+++ b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.cpp
diff --git a/virtualkeyboard/platforminputcontext/platforminputcontext.h b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.h
index bcfae44..bcfae44 100644
--- a/virtualkeyboard/platforminputcontext/platforminputcontext.h
+++ b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.h
diff --git a/virtualkeyboard/platforminputcontext/platforminputcontext.json b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.json
index 266da3c..266da3c 100644
--- a/virtualkeyboard/platforminputcontext/platforminputcontext.json
+++ b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.json
diff --git a/virtualkeyboard/platforminputcontext/platforminputcontext.pro b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.pro
index e2288fe..e2288fe 100644
--- a/virtualkeyboard/platforminputcontext/platforminputcontext.pro
+++ b/src/imports/virtualkeyboard/platforminputcontext/platforminputcontext.pro
diff --git a/virtualkeyboard/platforminputcontext/plugin.cpp b/src/imports/virtualkeyboard/platforminputcontext/plugin.cpp
index f63205f..f63205f 100644
--- a/virtualkeyboard/platforminputcontext/plugin.cpp
+++ b/src/imports/virtualkeyboard/platforminputcontext/plugin.cpp
diff --git a/src/imports/virtualkeyboard/qmlmodule.pro b/src/imports/virtualkeyboard/qmlmodule.pro
new file mode 100644
index 0000000..7f5c2b6
--- /dev/null
+++ b/src/imports/virtualkeyboard/qmlmodule.pro
@@ -0,0 +1,37 @@
+TARGETPATH = "Qt/labs/virtualkeyboard"
+
+QML_FILES = \
+	  images/shift.png \
+	  images/space.png \
+	  images/backspace.png \
+	  images/arrow.png \
+	  images/enter.png \
+	  images/keypad.png \
+	  images/hidekeyboard.png \
+	  TextField.qml \
+	  components/AutoScroller.qml \
+	  components/InputEngine.qml \
+	  components/HideKeyboardKey.qml \
+	  components/NumberKey.qml \
+	  components/CharacterPreviewBubble.qml \
+	  components/SymbolModeKey.qml \
+	  components/ChangeLanguageKey.qml \
+	  components/SpaceKey.qml \
+	  components/Icon.qml \
+	  components/BaseKey.qml \
+	  components/Key.qml \
+	  components/ShiftKey.qml \
+	  components/EnterKey.qml \
+	  components/AlternativeKeys.qml \
+	  components/PressedKey.qml \
+	  components/BackspaceKey.qml \
+	  Keyboard.qml \
+	  TextBase.qml \
+	  layouts/symbols.qml \
+	  layouts/numbers.qml \
+	  layouts/ar_AR.qml \
+	  layouts/en_GB.qml \
+	  layouts/fi_FI.qml \
+	  ScrollBar.qml \
+
+load(qml_module)
diff --git a/src/imports/virtualkeyboard/virtualkeyboard.pro b/src/imports/virtualkeyboard/virtualkeyboard.pro
new file mode 100644
index 0000000..bedd662
--- /dev/null
+++ b/src/imports/virtualkeyboard/virtualkeyboard.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += platforminputcontext qmlmodule.pro
diff --git a/virtualkeyboard/virtualkeyboard.qml b/src/imports/virtualkeyboard/virtualkeyboard.qml
index efeb482..efeb482 100644
--- a/virtualkeyboard/virtualkeyboard.qml
+++ b/src/imports/virtualkeyboard/virtualkeyboard.qml
diff --git a/virtualkeyboard/app.pro b/virtualkeyboard/app.pro
deleted file mode 100644
index 0f3d370..0000000
--- a/virtualkeyboard/app.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = virtualkeyboard
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/virtualkeyboard
-qml.files = content virtualkeyboard.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/virtualkeyboard
-INSTALLS += target qml
diff --git a/virtualkeyboard/content/ScrollBar.qml b/virtualkeyboard/content/ScrollBar.qml
deleted file mode 100644
index e6a8143..0000000
--- a/virtualkeyboard/content/ScrollBar.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    property var scrollArea: parent
-
-    width: 6
-    opacity: scrollArea && scrollArea.movingVertically ? 1.0 : 0.0
-    visible: scrollArea && scrollArea.contentHeight >= scrollArea.height
-    anchors { right: parent.right; top: parent.top; bottom: parent.bottom; margins: 2 }
-
-    Behavior on opacity { NumberAnimation { properties: "opacity"; duration: 600 } }
-
-    function size() {
-        var nh = scrollArea.visibleArea.heightRatio * height
-        var ny = scrollArea.visibleArea.yPosition * height
-        return ny > 3 ? Math.min(nh, Math.ceil(height - 3 - ny)) : nh + ny
-    }
-    Rectangle {
-        x: 1
-        y: scrollArea ? Math.max(2, scrollArea.visibleArea.yPosition * parent.height) : 0
-        height: scrollArea ? size() : 0
-        width: parent.width - 2
-        color: Qt.rgba(1.0, 1.0, 1.0, 0.5)
-        radius: 1
-    }
-}
diff --git a/virtualkeyboard/content/TextArea.qml b/virtualkeyboard/content/TextArea.qml
deleted file mode 100644
index cf337f6..0000000
--- a/virtualkeyboard/content/TextArea.qml
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TextBase {
-    id: textArea
-
-    property alias color: textEdit.color
-    property alias text: textEdit.text
-    property alias textWidth: textEdit.width
-    property alias readOnly: textEdit.readOnly
-    property alias inputMethodHints: textEdit.inputMethodHints
-
-    editor: textEdit
-
-    Repeater {
-        model: Math.floor((parent.height - 30) / editor.cursorRectangle.height)
-        Rectangle {
-            x: 8
-            y: (index+1)*editor.cursorRectangle.height+6
-            height: 1; width: textArea.width-24
-            color: Qt.rgba(1.0, 1.0, 1.0, 0.5)
-        }
-    }
-    TextEdit {
-        id: textEdit
-
-        property alias enterKeyText: textArea.enterKeyText
-        property alias enterKeyEnabled: textArea.enterKeyEnabled
-
-        y: 6
-        focus: true
-        color: "#EEEEEE"
-        wrapMode: TextEdit.Wrap
-        cursorVisible: activeFocus
-        height: Math.max(implicitHeight, 60)
-        font.pixelSize: textArea.fontPixelSize
-        selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
-        selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
-        anchors { left: parent.left; right: parent.right; margins: 12 }
-        cursorDelegate: Rectangle {
-            width: 2
-            opacity: 0.7
-            color: "#EEEEEE"
-            visible: textEdit.activeFocus
-        }
-
-        onActiveFocusChanged: if (!activeFocus) deselect()
-    }
-}
diff --git a/virtualkeyboard/content/TextBase.qml b/virtualkeyboard/content/TextBase.qml
deleted file mode 100644
index a26c6c6..0000000
--- a/virtualkeyboard/content/TextBase.qml
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-FocusScope {
-    id: textBase
-
-    property var editor
-    property bool previewTextActive: !editor.activeFocus && text.length === 0
-    property int fontPixelSize: 32
-    property string previewText
-    property string enterKeyText
-    property bool enterKeyEnabled: true
-    property alias mouseParent: mouseArea.parent
-
-    implicitHeight: editor.height + 12
-
-    signal enterKeyClicked
-
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Return)
-            enterKeyClicked()
-    }
-
-    Rectangle {
-        // background
-        radius: 5.0
-        anchors.fill: parent
-        color: Qt.rgba(1.0, 1.0, 1.0, 0.2)
-        border { width: editor.activeFocus ? 2 : 0; color: "#CCCCCC" }
-    }
-    Text {
-        id: previewText
-
-        y: 8
-        color: "#CCCCCC"
-        visible: previewTextActive
-        text: textBase.previewText
-        font.pixelSize: 28
-        anchors { left: parent.left; right: parent.right; margins: 12 }
-
-    }
-    MouseArea {
-        id: mouseArea
-
-        z: 1
-        parent: textBase
-        anchors.fill: parent
-        onClicked: {
-            var positionInEditor = mapToItem(editor, mouseX, mouseY)
-            var cursorPosition = editor.positionAt(positionInEditor.x, positionInEditor.y)
-            editor.cursorPosition = cursorPosition
-            editor.forceActiveFocus()
-            Qt.inputMethod.show()
-        }
-    }
-}
diff --git a/virtualkeyboard/content/TextField.qml b/virtualkeyboard/content/TextField.qml
deleted file mode 100644
index aa6768e..0000000
--- a/virtualkeyboard/content/TextField.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TextBase {
-    id: textField
-
-    property alias color: textInput.color
-    property alias text: textInput.text
-    property alias textWidth: textInput.width
-    property alias readOnly: textInput.readOnly
-    property alias inputMethodHints: textInput.inputMethodHints
-    property alias validator: textInput.validator
-    property alias echoMode: textInput.echoMode
-
-    editor: textInput
-    mouseParent: flickable
-
-    Flickable {
-        id: flickable
-
-        x: 12
-        clip: true
-        width: parent.width-24
-        height: parent.height
-        flickableDirection: Flickable.HorizontalFlick
-        interactive: contentWidth - 4 > width
-
-        contentWidth: textInput.width+2
-        contentHeight: textInput.height
-        TextInput {
-            id: textInput
-
-            property alias enterKeyText: textField.enterKeyText
-            property alias enterKeyEnabled: textField.enterKeyEnabled
-
-            y: 6
-            focus: true
-            color: "#EEEEEE"
-            cursorVisible: activeFocus
-            passwordCharacter: "\u2022"
-            font.pixelSize: textField.fontPixelSize
-            selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
-            selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
-            width: Math.max(flickable.width, implicitWidth)-2
-            cursorDelegate: Rectangle {
-                width: 2
-                opacity: 0.7
-                color: "#EEEEEE"
-                visible: textInput.activeFocus
-            }
-            onActiveFocusChanged: if (!activeFocus) deselect()
-        }
-    }
-}
diff --git a/virtualkeyboard/content/images/background.png b/virtualkeyboard/content/images/background.png
deleted file mode 100644
index d85f6ee..0000000
--- a/virtualkeyboard/content/images/background.png
+++ /dev/null
diff --git a/virtualkeyboard/main.cpp b/virtualkeyboard/main.cpp
deleted file mode 100644
index 0850ca0..0000000
--- a/virtualkeyboard/main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <QtQuick/QQuickView>
-#include <QtGui/QGuiApplication>
-
-int main(int argc, char *argv[])
-{
-    qputenv("QT_IM_MODULE", QByteArray("b2qtinputcontext"));
-
-    QGuiApplication app(argc, argv);
-    QQuickView view(QString("virtualkeyboard.qml"));
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-    view.show();
-
-    return app.exec();
-}
diff --git a/virtualkeyboard/virtualkeyboard.pro b/virtualkeyboard/virtualkeyboard.pro
deleted file mode 100644
index e31b9f1..0000000
--- a/virtualkeyboard/virtualkeyboard.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += platforminputcontext app.pro