summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@digia.com>2014-02-27 14:08:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-01 09:03:55 +0100
commitd30778538159498caad491ba1d74ed2f5bb10b0c (patch)
treecf4a7c6399394f839f233522bc1161a55d30d6b7 /src/plugins/platforms/android
parente2d21a0483530d3d306a9f3505834b71f84236fb (diff)
Android: avoid crash with toplevel QGLWidget
Task-number: QTBUG-37096 Change-Id: I14db37a78314782d7b5897db946283bd0063e348 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/platforms/android')
-rw-r--r--src/plugins/platforms/android/qandroidplatformbackingstore.cpp5
1 files changed, 4 insertions, 1 deletions
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<QAndroidPlatformRasterWindow *>(window->handle()))->setBackingStore(this);
+ if (window->surfaceType() == QSurface::RasterSurface)
+ (static_cast<QAndroidPlatformRasterWindow *>(window->handle()))->setBackingStore(this);
+ else
+ qWarning("QAndroidPlatformBackingStore does not support GL windows.");
}
QPaintDevice *QAndroidPlatformBackingStore::paintDevice()