From ddbcf783086941d6c189cd4822ac9fa63b35af34 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Fri, 6 Sep 2013 08:32:09 +0300 Subject: Move winId!=0 assertion from QWindow to QWidget In "very basic platform plugins", the platform window ID can be null, which conflicts with QWidget's special treatment of 0 as a parented widget. Such is the case with EGLFS, which can return a null native window handle for winId on some EGL implementations. Move the assertion winId!=0 into the widget framework, as this assert is not relevant for non-widget applications. A large proportion of basic platform plugin users will see relief from this unnecessary assertion. Change-Id: I25c9d96550cd747c77c9516d773e9cdebf7440ab Reviewed-by: Gunnar Sletta Reviewed-by: Robin Burchell --- src/gui/kernel/qwindow.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/gui') 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(this)->create(); - WId id = d->platformWindow->winId(); - // See the QPlatformWindow::winId() documentation - Q_ASSERT(id != WId(0)); - return id; + return d->platformWindow->winId(); } /*! -- cgit v1.2.3