diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-11-30 10:40:27 (GMT) |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-11-30 10:41:53 (GMT) |
| commit | 61f2b450560887651b3350e63bdd75609e3b6752 (patch) | |
| tree | 1ef8b64eca6f86bb35db5566f648716111adcae1 | |
| parent | c2c31f30830a4e1e455a13321dd7bae6ac8b360f (diff) | |
| download | Qt-61f2b450560887651b3350e63bdd75609e3b6752.zip Qt-61f2b450560887651b3350e63bdd75609e3b6752.tar.gz Qt-61f2b450560887651b3350e63bdd75609e3b6752.tar.bz2 | |
Fixed build on S60 and WinCE
Since qreal is a float on these targets, it was having trouble picking
the right version of qMax.
| -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); |