Workaround windows not gaining focus on mac.

Delaying giving focus to the rootItem until the canvas window gains
focus doesn't work if the window never gains focus.  So give focus to
the rootItem immediately so text input continues to work while
QTBUG-22415 is being resolved.

Task-number: QTBUG-22409
Change-Id: I1bdb13485219d0c2a2f8bdcb3e0972444e3813f2
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/declarative/items/qquickcanvas.cpp b/src/declarative/items/qquickcanvas.cpp
index 6df0c65c94..861b11ff36 100644
--- a/src/declarative/items/qquickcanvas.cpp
+++ b/src/declarative/items/qquickcanvas.cpp
@@ -495,6 +495,12 @@ void QQuickCanvasPrivate::init(QQuickCanvas *c)
     rootItemPrivate->canvas = q;
     rootItemPrivate->flags |= QQuickItem::ItemIsFocusScope;
 
+    // In the absence of a focus in event on some platforms assume the window will
+    // be activated immediately and set focus on the rootItem
+    // ### Remove when QTBUG-22415 is resolved.
+    //It is important that this call happens after the rootItem has a canvas..
+    rootItem->setFocus(true);
+
     bool threaded = !qmlNoThreadedRenderer();
 
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) {
@@ -633,13 +639,13 @@ void QQuickCanvasPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, F
     }
 
     if (!(options & DontChangeFocusProperty)) {
-        if (item != rootItem || QGuiApplication::focusWindow() == q) {
+//        if (item != rootItem || QGuiApplication::focusWindow() == q) {    // QTBUG-22415
             itemPrivate->focus = true;
             changed << item;
-        }
+//        }
     }
 
-    if (newActiveFocusItem && QGuiApplication::focusWindow() == q) {
+    if (newActiveFocusItem && rootItem->hasFocus()) {
         activeFocusItem = newActiveFocusItem;
 
         QQuickItemPrivate::get(newActiveFocusItem)->activeFocus = true;