diff options
author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-07-28 17:38:34 +0200 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-06 10:30:57 +0000 |
commit | 462e537e0334838a9bf90735f9fd14e1b91fc987 (patch) | |
tree | f3fc8e1ab6e1f51f3ada51a5b96d508e945034e2 /src/widgets/kernel/qwidgetbackingstore.cpp | |
parent | e9eeb68a656bd52c4a783dc4247c627c5363209a (diff) |
Fix a memory leak
We create dirtyOnScreenWidgets even if QT_NO_OPENGL is defined,
but dtor deletes this object only if no QT_NO_OPENGL is defined.
Also, copy ctor/assignment operator must be disabled for such a class.
Task-number: QTBUG-47499
Change-Id: I9f8b5721ff6324fa7b28b715af68d0a5496c5eb5
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/widgets/kernel/qwidgetbackingstore.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index d1070839fa..fff75d829f 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -763,9 +763,8 @@ QWidgetBackingStore::~QWidgetBackingStore() #ifndef QT_NO_OPENGL delete widgetTextures; - delete dirtyOnScreenWidgets; #endif - dirtyOnScreenWidgets = 0; + delete dirtyOnScreenWidgets; } //parent's coordinates; move whole rect; update parent and widget |