Fix QWidgetBackingStore::isDirty() for render-to-texture widgets

The backing store would not report itself dirty if only render-to-
texture widgets were dirty.

This caused QOpenGLWidgets not be repainted after being remapped if they
marked themselves dirty while unmapped.

Task-number: QTBUG-50818
Task-number: QTBUG-51815
Change-Id: If43f7cbb6f4d44831b4c21b89f884d6bcaebf87c
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-06-06 12:25:44 +02:00 committed by Allan Sandfeld Jensen
parent e005e99005
commit fa8d16d476

View File

@ -110,7 +110,7 @@ public:
inline bool isDirty() const inline bool isDirty() const
{ {
return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && !fullUpdatePending); return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && !fullUpdatePending && dirtyRenderToTextureWidgets.isEmpty());
} }
// ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore). // ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).