diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-30 11:03:12 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-07-28 10:05:56 +0000 |
| commit | 56a4a34eb3a69fe2740f06324e73b547ca4c4f50 (patch) | |
| tree | d71ab424e376d6a63e98de58df2e8a9ad217ff98 /src | |
| parent | cb05a4e8be61306ec4b84f5dfdac361ac6473b4b (diff) | |
Fix the internal compositing flag for QOpenGL/QuickWidget
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 <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |