1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge QWindow::parent overloads

Browse Source 
Change-Id: Ibec0f41de16694c38cf24fcdd4eeba74df62a1dd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-06-08 21:30:57 +02:00
parent ed51280630
commit 2a864a4f85
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/kernel/qwindow.cpp
View File

@ -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.

3
src/gui/kernel/qwindow.h
View File

@ -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;