From 2a864a4f8568b9fe4a56c02926ed5d873bc774b7 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Mon, 8 Jun 2020 21:30:57 +0200
Subject: [PATCH] Merge QWindow::parent overloads
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ibec0f41de16694c38cf24fcdd4eeba74df62a1dd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/gui/kernel/qwindow.cpp | 11 -----------
 src/gui/kernel/qwindow.h   |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 1b154770f8c..c06f03f4e7b 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -684,17 +684,6 @@ QWindow *QWindow::parent(AncestorMode mode) const
     return d->parentWindow ? d->parentWindow : (mode == IncludeTransients ? transientParent() : nullptr);
 }
 
-/*!
-    Returns the parent window, if any.
-
-    A window without a parent is known as a top level window.
-*/
-QWindow *QWindow::parent() const
-{
-    Q_D(const QWindow);
-    return d->parentWindow;
-}
-
 /*!
     Sets the \a parent Window. This will lead to the windowing system managing
     the clip of the window, so it will be clipped to the \a parent window.
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index b7c2af4916d..2cca0398835 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -159,8 +159,7 @@ public:
 
     WId winId() const;
 
-    QWindow *parent(AncestorMode mode) const;
-    QWindow *parent() const; // ### Qt6: Merge with above
+    QWindow *parent(AncestorMode mode = ExcludeTransients) const;
     void setParent(QWindow *parent);
 
     bool isTopLevel() const;