diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-14 01:11:43 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-14 01:11:43 +0200 |
| commit | 415f65fbff0ebbdeab09bbed8c06872352e3f5ca (patch) | |
| tree | 82f6d0d85df04e9c145543ec1be4d3fa58a919ca /src/widgets/kernel | |
| parent | 62fbf3ca6fc2d1736c6f5d5456f66ae1cfe94be8 (diff) | |
| parent | f7837e28b5f83d116fa43d0401b7188ce27fc346 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |