From b46fe39d940712c5d401e731e171a7ccfadfe648 Mon Sep 17 00:00:00 2001
From: Bernd Weimer <bernd.weimer@pelagicore.com>
Date: Mon, 23 Mar 2015 11:53:16 +0100
Subject: Harmonize input context selection

Input context selection works differently across platforms. On some
platforms it is not possible to request a specific context at all
(e.g. Wayland). This will be unified, depending on the environment
variable "QT_IM_MODULE", you will get:
- null:  default (platform) context, if defined (otherwise no context)
- empty: no context
- set:   set one, if it exists and is valid (otherwise no context)

[ChangeLog][Platform Specific Changes] Haromnized input context selection.
QT_IM_MODULE environment variable will be taken into account.

Change-Id: Ic8f826fbc6ace25941cd19b9b086943e848fbe01
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>
---
 src/plugins/platforms/cocoa/qcocoaintegration.mm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2e6bfc95db..051a1c8710 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -47,6 +47,7 @@
 #include "qcocoamimetypes.h"
 #include "qcocoaaccessibility.h"
 
+#include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qplatformaccessibility.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <QtCore/qcoreapplication.h>
@@ -286,9 +287,9 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
         qWarning("Creating multiple Cocoa platform integrations is not supported");
     mInstance = this;
 
-    mInputContext.reset(QPlatformInputContextFactory::create());
-    if (mInputContext.isNull())
-        mInputContext.reset(new QCocoaInputContext());
+    QString icStr = QPlatformInputContextFactory::requested();
+    icStr.isNull() ? mInputContext.reset(new QCocoaInputContext)
+                   : mInputContext.reset(QPlatformInputContextFactory::create(icStr));
 
     initResources();
     QMacAutoReleasePool pool;
-- 
cgit v1.2.3


From a5fb312cd631b1c70fc199245724e077727578a5 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Thu, 10 Sep 2015 12:17:32 +0200
Subject: Fix QT_NO_ACCESSIBILITY build on OS X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id8b41787fb9f50296ee9e0ad1f108418565d9325
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
---
 src/plugins/platforms/cocoa/qcocoaintegration.mm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 051a1c8710..6bec6b191d 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -502,14 +502,12 @@ QPlatformInputContext *QCocoaIntegration::inputContext() const
     return mInputContext.data();
 }
 
+#ifndef QT_NO_ACCESSIBILITY
 QCocoaAccessibility *QCocoaIntegration::accessibility() const
 {
-#ifndef QT_NO_ACCESSIBILITY
     return mAccessibility.data();
-#else
-    return 0;
-#endif
 }
+#endif
 
 QCocoaClipboard *QCocoaIntegration::clipboard() const
 {
-- 
cgit v1.2.3