AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix use of qMax() with floating point constants"

Browse Source 
This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850

Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
This commit is contained in:
Sergio Ahumada 2011-10-31 15:17:39 +01:00 committed by Qt by Nokia
parent 9c4547eea3
commit cf6ef44ffd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qcosmeticstroker.cpp
View File

@ -258,12 +258,12 @@ void QCosmeticStroker::setup()
patternLength = 0;
for (int i = 0; i < patternSize; ++i) {
patternLength += (int) qMax(qreal(1.) , penPattern.at(i)*64.);
patternLength += (int) qMax(1. , penPattern.at(i)*64.);
pattern[i] = patternLength;
}
patternLength = 0;
for (int i = 0; i < patternSize; ++i) {
patternLength += (int) qMax(qreal(1.), penPattern.at(patternSize - 1 - i)*64.);
patternLength += (int) qMax(1., penPattern.at(patternSize - 1 - i)*64.);
reversePattern[i] = patternLength;
}
strokeSelection |= Dashed;

2
src/widgets/styles/qstylehelper.cpp
View File

@ -246,7 +246,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
if (enabled) {
// Drop shadow
qreal shadowSize = qMax(qreal(1.0), penSize/2.0);
qreal shadowSize = qMax(1.0, penSize/2.0);
QRectF shadowRect= br.adjusted(-2*shadowSize, -2*shadowSize,
2*shadowSize, 2*shadowSize);
QRadialGradient shadowGradient(shadowRect.center().x(),