Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: Ied53fe56a6b9c9a71b5bbe9ed85270fb89ad8c5c

2 files changed, 42 insertions, 0 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 00000000..5fbf85e5
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,34 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. 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.
+
+****************************************************************************
+*                              New Features                                *
+****************************************************************************
+
+ -  Changed behavior of shift handler to only activate
+   caps lock if the shift key is double-clicked.
+ -  Added support for selection handles for the dedicated VKB.
+ - [QTBUG-54254]  Add support for external keyboard layouts, which allows
+   overriding and exclusion of the built-in keyboard layouts
+ -  Add new property InputContext.uppercase, which is set to
+   true when either InputContext.shift or InputContext.capsLock is true
+ -  Added language selection popup for faster selection of
+   input language.
+ -  Automatically hide word candidate list when inactive.
+ -  Added support for automatic selection of the only remaining
+   word in the suggestion list.
+ -  Added full screen input mode for super wide screens.
diff --git a/src/virtualkeyboard/styles/styles_plugin.h b/src/virtualkeyboard/styles/styles_plugin.h
index f401fdb9..9673a23a 100644
--- a/src/virtualkeyboard/styles/styles_plugin.h
+++ b/src/virtualkeyboard/styles/styles_plugin.h
@@ -32,12 +32,20 @@
 
 #include <QQmlExtensionPlugin>
 
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtQuick_VirtualKeyboard_Styles);
+#endif
+}
+
 class QtVirtualKeyboardStylesPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
+    QtVirtualKeyboardStylesPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
 };