Fix to incorrect ApplicationActivate event in QtOpenGL

QEvent::ApplicationActivate is sent incorrectly when application
goes to background if OpenGL graphics system is used. The problem
is that hidden global shared QGLWidget used by QtOpenGL for root
context is added to CONE stack. Qt destroys shared GL widget
when application goes to background and underlying CCoeControl
is removed from CONE stack which causes CONE to handle
stack changes. CONE tries to focus next control in stack which
causes incorrect focus events in Qt leading to
ApplicationActivate event. GL global share widget must not
be added to CONE stack because it's hidden utility widget
and don't belong to UI widget stack.

Task-number: QTBUG-23195
Task-number: ou1cimx1#946477

Reviewed-by: Murray Read

1 files changed, 10 insertions, 8 deletions

diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index a37c265f8e..fefa781fb5 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -393,16 +393,18 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de
                 stackingFlags = ECoeStackFlagStandard;
             }
             control->MakeVisible(false);
-            QT_TRAP_THROWING(control->ControlEnv()->AppUi()->AddToStackL(control.data(), ECoeStackPriorityDefault, stackingFlags));
-            // Avoid keyboard focus to a hidden window.
-            control->setFocusSafely(false);
 
-            RDrawableWindow *const drawableWindow = control->DrawableWindow();
-            // Request mouse move events.
-            drawableWindow->PointerFilter(EPointerFilterEnterExit
-                | EPointerFilterMove | EPointerFilterDrag, 0);
-            drawableWindow->EnableVisibilityChangeEvents();
+            if (!isGLGlobalShareWidget) {
+                QT_TRAP_THROWING(control->ControlEnv()->AppUi()->AddToStackL(control.data(), ECoeStackPriorityDefault, stackingFlags));
+                // Avoid keyboard focus to a hidden window.
+                control->setFocusSafely(false);
 
+                RDrawableWindow *const drawableWindow = control->DrawableWindow();
+                // Request mouse move events.
+                drawableWindow->PointerFilter(EPointerFilterEnterExit
+                    | EPointerFilterMove | EPointerFilterDrag, 0);
+                drawableWindow->EnableVisibilityChangeEvents();
+            }
         }
 
         q->setAttribute(Qt::WA_WState_Created);