diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 21:30:57 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 23:24:32 +0200 |
commit | 2a864a4f8568b9fe4a56c02926ed5d873bc774b7 (patch) | |
tree | a06ef01244ce66a89e03081b702bb1f1b2ff10cb /src | |
parent | ed512806301947f48a2267291fd73f3b9fa78a43 (diff) |
Merge QWindow::parent overloads
Change-Id: Ibec0f41de16694c38cf24fcdd4eeba74df62a1dd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 11 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 1b154770f8..c06f03f4e7 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -685,17 +685,6 @@ QWindow *QWindow::parent(AncestorMode mode) const } /*! - 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 b7c2af4916..2cca039883 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; |