diff options
| author | axis <qt-info@nokia.com> | 2009-06-02 10:14:04 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-02 10:14:04 +0200 |
| commit | 3c594257c4aedf113de92c5888e74f676ba87385 (patch) | |
| tree | e309c7502e13f552203b509494a20792125fed29 /src/svg | |
| parent | 539989f41316329e7aba69ba97e1579eed6036e6 (diff) | |
| parent | 0ff7b68f2e3f184d809cf6fd13ff930efa493e9f (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index e822da5f35..fd4c8755e6 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -261,7 +261,7 @@ public: constantAlpha &= (stops.at(i).second.alpha() == alpha); if (!constantAlpha) { - const qreal spacing = 0.02; + const qreal spacing = qreal(0.02); QGradientStops newStops; QRgb fromColor = PREMUL(stops.at(0).second.rgba()); QRgb toColor; |