diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
| commit | 6572650641a2f64f0dd4f41b0426bbd3698f6530 (patch) | |
| tree | b28400a2983e044dc7911607ff57b27a9c8cd1bc /src/gui/painting | |
| parent | 60e20abf19f58c34cb3a878636d955993b81cf2e (diff) | |
| parent | ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: If11da7799075cc2d5768da5603c5fc46773c4eae
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 84b34e390b..3ce54c20be 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1716,8 +1716,8 @@ void QPainter::restore() static inline void qt_cleanup_painter_state(QPainterPrivate *d) { + qDeleteAll(d->states); d->states.clear(); - delete d->state; d->state = 0; d->engine = 0; d->device = 0; |