diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-24 10:26:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-24 10:26:26 (GMT) |
| commit | ed3b35cff7ed7663971665e67d3a4037da8bd158 (patch) | |
| tree | 74c08f6edcc96566e2fb4ddf75ad5c4e7572d028 /src/svg | |
| parent | 3ab7dc5d764d41bf828dd76672ca2918b004bad3 (diff) | |
| parent | 10fa7986020c75da0ce68ec051a1086bd6bf5bf4 (diff) | |
| download | Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.zip Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.tar.gz Qt-ed3b35cff7ed7663971665e67d3a4037da8bd158.tar.bz2 | |
Merge branch '4.5'
Conflicts (version number change in 4.5):
src/corelib/global/qglobal.h
src/qbase.pri
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index b065395..bd0804c 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -808,6 +808,7 @@ void QSvgGradientStyle::resolveStops() static_cast<QSvgGradientStyle*>(prop); st->resolveStops(); m_gradient->setStops(st->qgradient()->stops()); + m_gradientStopsSet = st->gradientStopsSet(); } } m_link = QString(); |