summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2017-12-14 01:25:32 -0800
committerMatt Ranostay <matt.ranostay@konsulko.com>2017-12-14 09:30:03 +0000
commitbf7f99500b3478054388d1124c71fecfa7c3e74b (patch)
tree23d96eb33f59ce49fd4facb452b34ff4f0410faf
parentb734304cbff43b01b18315d0b8c5d6102a845682 (diff)
Revert "settings: switch keyboard to qtvirtualkeyboardplugin"
This reverts commit 9990ec3dfdbd159b2077a33aa62dd52f53f174b2. Currently SPEC-1120 is blocking qtvirtualkeyboard from sending keystokes to applications. Bug-AGL: SPEC-1185 Change-Id: I02d02f6c1cf912d5b4f0face0add9c9af43c2af2 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--app/Settings.qml10
-rw-r--r--app/app.pro5
-rw-r--r--app/main.cpp1
-rw-r--r--app/wifi/Wifi.qml8
4 files changed, 8 insertions, 16 deletions
diff --git a/app/Settings.qml b/app/Settings.qml
index 5862bd8..56767f3 100644
--- a/app/Settings.qml
+++ b/app/Settings.qml
@@ -17,7 +17,6 @@
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
-import QtQuick.VirtualKeyboard 2.1
import 'datetime'
import 'bluetooth'
@@ -33,15 +32,6 @@ ApplicationWindow {
stack.pop(settings)
}
- InputPanel {
- id: inputPanel
- z: 1
- visible: Qt.inputMethod.visible
- y: Qt.inputMethod.visible ? parent.height - inputPanel.height : parent.height
- anchors.left: parent.left
- anchors.right: parent.right
- }
-
StackView {
id: stack
anchors.fill: parent
diff --git a/app/app.pro b/app/app.pro
index ee88c13..36a71f0 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -6,11 +6,6 @@ SOURCES = main.cpp
CONFIG += link_pkgconfig
PKGCONFIG += libhomescreen qlibwindowmanager
-static {
- QTPLUGIN += qtvirtualkeyboardplugin
- QT += svg
-}
-
RESOURCES += \
settings.qrc \
images/images.qrc \
diff --git a/app/main.cpp b/app/main.cpp
index 3a71fb0..d496ef6 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
{
QString myname = QString("Settings");
- qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
QGuiApplication app(argc, argv);
app.setApplicationName(myname);
app.setApplicationVersion(QStringLiteral("0.1.0"));
diff --git a/app/wifi/Wifi.qml b/app/wifi/Wifi.qml
index d6b76c9..77e0759 100644
--- a/app/wifi/Wifi.qml
+++ b/app/wifi/Wifi.qml
@@ -399,6 +399,14 @@ SettingPage {
}
}
}
+
+ Keyboard {
+ id: keyboard
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ Layout.preferredHeight: 1
+ target: activeFocusControl
+ }
}
}