diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 01:00:20 +0100 |
| commit | 858c5a73fc7d2bee1d116fb70f723c277bc0dc6d (patch) | |
| tree | bb300759685fadd199b46dfb0cd98b4fe7968768 /src/gui/kernel | |
| parent | 4ec6748c6a30f74e6d8fbb90fc118b306d1fa690 (diff) | |
| parent | 3e9f8b5249282324c615941af97f1ebf8a85991f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index c4c7de1b2e..dad1b6ba2d 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2690,7 +2690,6 @@ QOpenGLContext *QWindowPrivate::shareContext() const platform dependent and untested. \sa setParent() - \sa setTransientParent() */ QWindow *QWindow::fromWinId(WId id) { |