diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-30 12:14:30 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-30 12:14:30 (GMT) |
| commit | c64761ff2c8c6125ebcffafed14019e363769a4c (patch) | |
| tree | d6c3660d0ed67ea3e9920f02684c5a46b23146b1 | |
| parent | 84794dee63d9f90fc3e2d579644a6a2835513e9e (diff) | |
| parent | 61f2b450560887651b3350e63bdd75609e3b6752 (diff) | |
| download | Qt-c64761ff2c8c6125ebcffafed14019e363769a4c.zip Qt-c64761ff2c8c6125ebcffafed14019e363769a4c.tar.gz Qt-c64761ff2c8c6125ebcffafed14019e363769a4c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index fc1863f..443c9c5 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5918,7 +5918,7 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen) if (QPixmapCache::find(key, pixmap)) return pixmap; - const qreal halfPeriod = qMax(qreal(2), radiusBase * 1.61803399); // the golden ratio + const qreal halfPeriod = qMax(qreal(2), qreal(radiusBase * 1.61803399)); // the golden ratio const int width = qCeil(100 / (2 * halfPeriod)) * (2 * halfPeriod); const int radius = qFloor(radiusBase); |