summaryrefslogtreecommitdiffstats
path: root/src/printsupport/kernel/qpaintengine_alpha.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-02 12:45:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-02 17:36:45 +0200
commitbdcd86c03e1b5c66dec21746d4d3596eb556b77b (patch)
tree5d9d24c69a704e5c67ac620ce1c04d2373df0728 /src/printsupport/kernel/qpaintengine_alpha.cpp
parentda888ba53904af75c462af9f753191f25840e51f (diff)
parentccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/printsupport/kernel/qpaintengine_alpha.cpp')
-rw-r--r--src/printsupport/kernel/qpaintengine_alpha.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp
index 7d4dc18111..ddfa918b90 100644
--- a/src/printsupport/kernel/qpaintengine_alpha.cpp
+++ b/src/printsupport/kernel/qpaintengine_alpha.cpp
@@ -345,8 +345,8 @@ void QAlphaPaintEngine::flushAndInit(bool init)
d->m_picpainter->setFont(painter()->font());
d->m_picpainter->setOpacity(painter()->opacity());
d->m_picpainter->setTransform(painter()->combinedTransform());
- *d->m_picpainter->d_func()->state = *painter()->d_func()->state;
d->m_picengine->syncState();
+ *d->m_picpainter->d_func()->state = *painter()->d_func()->state;
}
}