diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-24 21:10:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-24 22:37:52 +0200 |
| commit | a1d2bf257e5240aadcd0d3b95f04ee2c86925b88 (patch) | |
| tree | 874e4cc617fdae7e558a1ee653b9e2fbf3df1ad2 /src/printsupport/kernel/qpaintengine_alpha.cpp | |
| parent | 223f5c0273452b1ccd48b6f1057598f507a1b2b9 (diff) | |
| parent | abd3b8030cbcc50379578b88ce6019e338ff8597 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/printsupport/kernel/qpaintengine_alpha.cpp')
| -rw-r--r-- | src/printsupport/kernel/qpaintengine_alpha.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp index ebb1b85e83..cdf5570979 100644 --- a/src/printsupport/kernel/qpaintengine_alpha.cpp +++ b/src/printsupport/kernel/qpaintengine_alpha.cpp @@ -359,7 +359,10 @@ void QAlphaPaintEngine::flushAndInit(bool init) d->m_picpainter->setOpacity(painter()->opacity()); d->m_picpainter->setTransform(painter()->combinedTransform()); d->m_picengine->syncState(); - *d->m_picpainter->d_func()->state = *painter()->d_func()->state; + QPainterState &state = *d->m_picpainter->d_func()->state; + QPainter *oldPainter = state.painter; + state = *painter()->d_func()->state; + state.painter = oldPainter; } } |