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/gui/kernel/qwindow.h | |
| parent | ed512806301947f48a2267291fd73f3b9fa78a43 (diff) | |
Merge QWindow::parent overloads
Change-Id: Ibec0f41de16694c38cf24fcdd4eeba74df62a1dd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindow.h')
| -rw-r--r-- | src/gui/kernel/qwindow.h | 3 |
1 files changed, 1 insertions, 2 deletions
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; |