From 56a4a34eb3a69fe2740f06324e73b547ca4c4f50 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 30 Jun 2015 11:03:12 +0200 Subject: Fix the internal compositing flag for QOpenGL/QuickWidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compositing stays active for the window even when all such widgets get destroyed. Task-number: QTBUG-46937 Change-Id: Ib4acc90689151fd7de234806c4b5c0c472c13a5c Reviewed-by: Jørgen Lind --- src/widgets/kernel/qwidgetbackingstore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index d1070839fa..2a339cda4c 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -74,7 +74,7 @@ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion ®ion, QBack Q_UNUSED(widgetTextures); Q_ASSERT(!region.isEmpty()); #else - Q_ASSERT(!region.isEmpty() || (widgetTextures && widgetTextures->count())); + Q_ASSERT(!region.isEmpty() || widgetTextures); #endif Q_ASSERT(widget); Q_ASSERT(backingStore); @@ -1124,7 +1124,7 @@ void QWidgetBackingStore::doSync() widgetTextures = new QPlatformTextureList; findTextureWidgetsRecursively(tlw, tlw, widgetTextures); } - qt_window_private(tlw->windowHandle())->compositing = widgetTextures && !widgetTextures->isEmpty(); + qt_window_private(tlw->windowHandle())->compositing = widgetTextures; fullUpdatePending = false; #endif -- cgit v1.2.3