From 0715e1e6c2d38776cd9d5661639ce517f685fa6f Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 2 Aug 2012 13:17:16 +0100 Subject: [PATCH] QNX: Ensure that m_requestedBufferSize is properly initialised This solves a new corner case resulting from the recent refactoring of QQnxWindow::setGeometry() that occurs when using a plain OpenGL backed window in a single threaded environment and the user code calls QOpenGLContext::makeCurrent(this) in the QWindow subclass ctor. Change-Id: Iaf07fbff1cb2743f5706020a8d657a82cb9f2255 Reviewed-by: Kevin Ottens Reviewed-by: Kevin Krammer Reviewed-by: Giuseppe D'Angelo --- src/plugins/platforms/qnx/qqnxwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 68a576cc37..3c05f49b85 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -73,7 +73,8 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context) m_screen(0), m_parentWindow(0), m_visible(true), - m_windowState(Qt::WindowNoState) + m_windowState(Qt::WindowNoState), + m_requestedBufferSize(window->geometry().size()) { qWindowDebug() << Q_FUNC_INFO << "window =" << window << ", size =" << window->size(); int result;