diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 490cf0c110..11a6238fa1 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -502,10 +502,7 @@ WId QWindow::winId() const if(!d->platformWindow) const_cast<QWindow *>(this)->create(); - WId id = d->platformWindow->winId(); - // See the QPlatformWindow::winId() documentation - Q_ASSERT(id != WId(0)); - return id; + return d->platformWindow->winId(); } /*! diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 665aa4b17a..a06283be02 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -153,7 +153,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO } setWindowModified_helper(); - setWinId(win->winId()); + WId id = win->winId(); + // See the QPlatformWindow::winId() documentation + Q_ASSERT(id != WId(0)); + setWinId(id); // Check children and create windows for them if necessary q_createNativeChildrenAndSetParent(q); |