From d30778538159498caad491ba1d74ed2f5bb10b0c Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 27 Feb 2014 14:08:06 +0100 Subject: [PATCH] Android: avoid crash with toplevel QGLWidget Task-number: QTBUG-37096 Change-Id: I14db37a78314782d7b5897db946283bd0063e348 Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../platforms/android/qandroidplatformbackingstore.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp index 1df7ce3179..b85b1157a8 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp @@ -51,7 +51,10 @@ QAndroidPlatformBackingStore::QAndroidPlatformBackingStore(QWindow *window) : QPlatformBackingStore(window) { Q_ASSERT(window->handle()); - (static_cast(window->handle()))->setBackingStore(this); + if (window->surfaceType() == QSurface::RasterSurface) + (static_cast(window->handle()))->setBackingStore(this); + else + qWarning("QAndroidPlatformBackingStore does not support GL windows."); } QPaintDevice *QAndroidPlatformBackingStore::paintDevice()