Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/client/qwaylandintegration.cpp

Change-Id: I29120f06d33c2d383a41cf35ca4a59f5d8548ad7

1 files changed, 12 insertions, 7 deletions

diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index c8d121766..407d90b94 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -128,14 +128,19 @@ QWaylandIntegration::QWaylandIntegration()
     mClipboard = new QWaylandClipboard(mDisplay);
     mDrag = new QWaylandDrag(mDisplay);
 
-    //try to use the input context using the wl_text_input interface
-    QPlatformInputContext *ctx = new QWaylandInputContext(mDisplay);
-    mInputContext.reset(ctx);
-
-    //use the traditional way for on screen keyboards for now
-    if (!mInputContext.data()->isValid()) {
-        ctx = QPlatformInputContextFactory::create();
+    QString icStr = QPlatformInputContextFactory::requested();
+    if (!icStr.isNull()) {
+        mInputContext.reset(QPlatformInputContextFactory::create(icStr));
+    } else {
+        //try to use the input context using the wl_text_input interface
+        QPlatformInputContext *ctx = new QWaylandInputContext(mDisplay);
         mInputContext.reset(ctx);
+
+        //use the traditional way for on screen keyboards for now
+        if (!mInputContext.data()->isValid()) {
+            ctx = QPlatformInputContextFactory::create();
+            mInputContext.reset(ctx);
+        }
     }
 }