Make a top-level QGLWidget work once, 50% of the time

2 files changed, 14 insertions, 4 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 1e522d6..6c6f6d9 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1361,6 +1361,10 @@ QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags()
         }
     }
 
+#ifdef Q_WS_LITE
+    hasOpenGL(); // ### I have no idea why this is needed here, but it makes things work for testlite
+#endif
+
     QString versionString(QLatin1String(reinterpret_cast<const char*>(glGetString(GL_VERSION))));
     OpenGLVersionFlags versionFlags = qOpenGLVersionFlagsFromString(versionString);
     if (currentCtx) {
@@ -3907,7 +3911,7 @@ void QGLWidget::resizeOverlayGL(int, int)
 /*! \fn bool QGLWidget::event(QEvent *e)
   \reimp
 */
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS)
+#if !defined(Q_OS_WINCE) && !defined(Q_WS_QWS) && !defined(Q_WS_LITE)
 bool QGLWidget::event(QEvent *e)
 {
     Q_D(QGLWidget);
diff --git a/src/opengl/qgl_lite.cpp b/src/opengl/qgl_lite.cpp
index a46593e..2a70545 100644
--- a/src/opengl/qgl_lite.cpp
+++ b/src/opengl/qgl_lite.cpp
@@ -232,17 +232,23 @@ void QGLWidget::setMouseTracking(bool enable)
     Q_UNUSED(enable);
 }
 
+bool QGLWidget::event(QEvent *e)
+{
+    QWidget::event(e);
+}
+
 void QGLWidget::resizeEvent(QResizeEvent *)
 {
     Q_D(QGLWidget);
     if (!isValid())
         return;
     makeCurrent();
-    if (!d->glcx->initialized())
-        glInit();
-    resizeGL(width(), height());
+//    if (!d->glcx->initialized())
+//        glInit();
+//    resizeGL(width(), height());
 }
 
+
 const QGLContext* QGLWidget::overlayContext() const
 {
     return 0;