diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 23:38:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 23:38:13 (GMT) |
| commit | 4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc (patch) | |
| tree | dd58ad45196b2e8bead2fd6bfe635fb9643942ca /src/gui/painting/qbrush.cpp | |
| parent | 46082389f2a700a1f98826e0c575ab4e31059761 (diff) | |
| parent | c4015c6a6ea663829b13596ebbbbcea3d9acb71f (diff) | |
| download | Qt-4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc.zip Qt-4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc.tar.gz Qt-4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Avoid compilation warnings on Symbian
Get rid of double conversions and arithmetic when qreal is float.
Diffstat (limited to 'src/gui/painting/qbrush.cpp')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 2afb2a3..bf5764a 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -1787,7 +1787,7 @@ static QPointF qt_radial_gradient_adapt_focal_point(const QPointF ¢er, // We have a one pixel buffer zone to avoid numerical instability on the // circle border //### this is hacky because technically we should adjust based on current matrix - const qreal compensated_radius = radius - radius * 0.001; + const qreal compensated_radius = radius - radius * qreal(0.001); QLineF line(center, focalPoint); if (line.length() > (compensated_radius)) line.setLength(compensated_radius); |