From d3d8a717fdd74f9d277c1723a854e20a0d44cce2 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 19 Jul 2023 15:55:40 +0200 Subject: [PATCH] android backingstore: Drop out-of-date surface type check Running a Vulkan-based QRhiWidget (upcoming in 6.7) and QQuickWidget shows the "...does not support OpenGL-only windows" warning which is pointless nowadays. Since Qt 6.4 RasterGLSurface is not in use, whereas the surface type can very well be VulkanSurface too. Change-Id: I790767e683b2a4cffc99cbc38015aca809cf83c5 Reviewed-by: Assam Boudjelthia (cherry picked from commit 4abf862bca3a4942afc1953411fb7ad3871f032e) Reviewed-by: Qt Cherry-pick Bot --- .../platforms/android/qandroidplatformbackingstore.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp index 07a1c835d3e..33c422bb1ec 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.cpp +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.cpp @@ -41,12 +41,8 @@ void QAndroidPlatformBackingStore::resize(const QSize &size, const QRegion &stat void QAndroidPlatformBackingStore::setBackingStore(QWindow *window) { - if (window->surfaceType() == QSurface::RasterSurface || window->surfaceType() == QSurface::RasterGLSurface) { - (static_cast(window->handle()))->setBackingStore(this); - m_backingStoreSet = true; - } else { - qWarning("QAndroidPlatformBackingStore does not support OpenGL-only windows."); - } + (static_cast(window->handle()))->setBackingStore(this); + m_backingStoreSet = true; } QT_END_NAMESPACE