summaryrefslogtreecommitdiffstats
path: root/src/svg
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-18 14:51:35 (GMT)
commit396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch)
tree3ff6670ef4b192fd0993e0e9629e616570a6475a /src/svg
parente356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff)
parent31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff)
downloadQt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz
Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/qsvghandler.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 44477e5..e2c1312 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -3378,6 +3378,7 @@ void QSvgHandler::init()
{
m_doc = 0;
m_style = 0;
+ m_animEnd = 0;
m_defaultCoords = LT_PX;
m_defaultPen = QPen(Qt::black, 1, Qt::NoPen, Qt::FlatCap, Qt::SvgMiterJoin);
m_defaultPen.setMiterLimit(4);