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/gui/kernel/qwindow.cpp | |
| parent | 62fbf3ca6fc2d1736c6f5d5456f66ae1cfe94be8 (diff) | |
| parent | f7837e28b5f83d116fa43d0401b7188ce27fc346 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 2e9577fee6..deb8613056 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(); } /*! |