diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-03 16:16:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-10 13:05:43 +0200 |
| commit | a096b4680dca367ec26725d064eba1df6c37d6b7 (patch) | |
| tree | 8107797094e519524555ae9637850781d8f40c77 /src | |
| parent | 3dde073269b059aa238f3cd104a10d2fdb90c350 (diff) | |
Search toplevel when setting the active window from focus window.
Task-number: QTBUG-32177
Task-number: QTBUG-32180
Change-Id: I44bea8c15636d788d85d6cbfa737aca5901c532c
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qapplication_qpa.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 2761c84a8d..852b6b9697 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -126,6 +126,8 @@ bool QApplicationPrivate::modalState() QWidget *qt_tlw_for_window(QWindow *wnd) { + while (wnd && !wnd->isTopLevel()) // QTBUG-32177, wnd might be a QQuickView embedded via window container. + wnd = wnd->parent(); if (wnd) foreach (QWidget *tlw, qApp->topLevelWidgets()) if (tlw->windowHandle() == wnd) |