fix QWidget::activateWindow for child widgets

For child widgets we must use the windowHandle of the toplevel widget.

Change-Id: If7bad8ed4bba694806a2c8b77bae3d25cc200b8b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 5b3155f..f03d2bd 100644 (file)
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -439,8 +439,10 @@ QWidget *QWidget::keyboardGrabber()
 
 void QWidget::activateWindow()
 {
-    if (windowHandle())
-        windowHandle()->requestActivateWindow();
+    QWindow *const wnd = window()->windowHandle();
+
+    if (wnd)
+        wnd->requestActivateWindow();
 }
 
 // Position top level windows at the center, avoid showing