1 files changed, 23 insertions, 8 deletions

diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 11432a4272..6fd2afb1aa 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -192,15 +192,30 @@ bool QPlatformWindow::isActive() const
 }
 
 /*!
-    Returns \c true if the window is a descendant of an embedded non-Qt window.
-    Example of an embedded non-Qt window is the parent window of an in-process QAxServer.
+    Returns \c true if the window is an ancestor of the given \a child.
 
-    If \a parentWindow is nonzero, only check if the window is embedded in the
-    specified \a parentWindow.
+    Platform overrides should iterate the native window hierarchy of the child,
+    to ensure that ancestary is reflected even with native windows in the window
+    hierarchy.
 */
-bool QPlatformWindow::isEmbedded(const QPlatformWindow *parentWindow) const
+bool QPlatformWindow::isAncestorOf(const QPlatformWindow *child) const
+{
+    for (const QPlatformWindow *parent = child->parent(); parent; parent = child->parent()) {
+        if (parent == this)
+            return true;
+    }
+
+    return false;
+}
+
+/*!
+    Returns \c true if the window is a child of a non-Qt window.
+
+    A embedded window has no parent platform window as reflected
+    though parent(), but will have a native parent window.
+*/
+bool QPlatformWindow::isEmbedded() const
 {
-    Q_UNUSED(parentWindow);
     return false;
 }
 
@@ -262,13 +277,13 @@ WId QPlatformWindow::winId() const
     return WId(1);
 }
 
+//jl: It would be useful to have a property on the platform window which indicated if the sub-class
+// supported the setParent. If not, then geometry would be in screen coordinates.
 /*!
     This function is called to enable native child window in QPA. It is common not to support this
     feature in Window systems, but can be faked. When this function is called all geometry of this
     platform window will be relative to the parent.
 */
-//jl: It would be useful to have a property on the platform window which indicated if the sub-class
-// supported the setParent. If not, then geometry would be in screen coordinates.
 void QPlatformWindow::setParent(const QPlatformWindow *parent)
 {
     Q_UNUSED(parent);