diff options
author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-07-31 11:43:15 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 20:26:08 +0200 |
commit | f6169ae4b11cad245ce244a474cad6d570be357a (patch) | |
tree | 85a7087f0f8f48eca60549b5f10faf1671f48bfb /src/widgets/kernel/qwidget_qpa.cpp | |
parent | 0d8795fcb45411809dce3de5918e5d3125411b14 (diff) |
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>
Diffstat (limited to 'src/widgets/kernel/qwidget_qpa.cpp')
-rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 5b3155fbc0..f03d2bd204 100644 --- 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 |