Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4

 Conflicts:
	.qmake.conf

Change-Id: I471b847231e6c09a79d8f0b1695a15b4651839da

6 files changed, 37 insertions, 6 deletions

diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2
new file mode 100644
index 00000000..ac9c7bb3
--- /dev/null
+++ b/dist/changes-5.9.2
@@ -0,0 +1,30 @@
+Qt 5.9.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               Qt 5.9.2 Changes                           *
+****************************************************************************
+
+OpenWNN
+-------
+
+ - [QTBUG-62133] Fixed and optimized OpenWNN engine (as a workaround for
+   QStringLiteral breakage)
+ - [QTBUG-62143] Fixed crash when pressing the space after entering a
+   smiley.
diff --git a/qtvirtualkeyboard.pro b/qtvirtualkeyboard.pro
index 6394e32c..d3abe826 100644
--- a/qtvirtualkeyboard.pro
+++ b/qtvirtualkeyboard.pro
@@ -1,4 +1,5 @@
 OTHER_FILES += README.md
 requires(qtHaveModule(quick))
+requires(qtHaveModule(svg))
 requires(!winrt)
 load(qt_parts)
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index 002bc5d6..6c49ee67 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -263,7 +263,7 @@ KeyboardStyle {
             Text {
                 id: enterKeyText
                 visible: text.length !== 0
-                text: control.actionId !== EnterKeyAction.None ? "" : control.displayText
+                text: control.actionId !== EnterKeyAction.None ? control.displayText : ""
                 clip: true
                 fontSizeMode: Text.HorizontalFit
                 horizontalAlignment: Text.AlignHCenter
@@ -309,7 +309,7 @@ KeyboardStyle {
                 }
                 PropertyChanges {
                     target: enterKeyText
-                    opacity: 0.05
+                    opacity: 0.2
                 }
             }
         ]
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 0a76a7e7..c22338ba 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -295,7 +295,7 @@ KeyboardStyle {
         Text {
             id: enterKeyText
             visible: text.length !== 0
-            text: control.actionId !== EnterKeyAction.None ? "" : control.displayText
+            text: control.actionId !== EnterKeyAction.None ? control.displayText : ""
             clip: true
             fontSizeMode: Text.HorizontalFit
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp
index 43b0c1cc..e825f05b 100644
--- a/src/virtualkeyboard/inputengine.cpp
+++ b/src/virtualkeyboard/inputengine.cpp
@@ -378,9 +378,8 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod)
 
             // Set current text case
             d->inputMethod->setTextCase(d->textCase);
-
-            updateSelectionListModels();
         }
+        updateSelectionListModels();
         emit inputMethodChanged();
         emit patternRecognitionModesChanged();
     }
diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp
index 7606a1c6..78316465 100644
--- a/src/virtualkeyboard/selectionlistmodel.cpp
+++ b/src/virtualkeyboard/selectionlistmodel.cpp
@@ -31,6 +31,7 @@
 #include "abstractinputmethod.h"
 #include "settings.h"
 #include <QtCore/private/qabstractitemmodel_p.h>
+#include <QtCore/qpointer.h>
 
 namespace QtVirtualKeyboard {
 
@@ -47,7 +48,7 @@ public:
     }
 
     QHash<int, QByteArray> roles;
-    AbstractInputMethod *dataSource;
+    QPointer<AbstractInputMethod> dataSource;
     SelectionListModel::Type type;
     int rowCount;
     bool wclAutoCommitWord;