summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-07-22 13:59:58 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-07-22 14:01:00 (GMT)
commite2aa651aba89bcc409dd090466b04036277a9a7c (patch)
tree251c32e4fa81e0ac9250a442ba0ea9c57dd5512d
parent1a55f40b6223511d0eb388064597ab38a0d37627 (diff)
downloadQt-e2aa651aba89bcc409dd090466b04036277a9a7c.zip
Qt-e2aa651aba89bcc409dd090466b04036277a9a7c.tar.gz
Qt-e2aa651aba89bcc409dd090466b04036277a9a7c.tar.bz2
Compile on embedded
-rw-r--r--src/gui/styles/qcleanlooksstyle.cpp2
-rw-r--r--src/gui/styles/qgtkstyle.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index ccf81cb..8f88781 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -1746,7 +1746,7 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o
int maxWidth = rect.width() - 4;
int minWidth = 4;
qreal progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar
- int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(1.0, qreal(bar->maximum) - bar->minimum);
+ int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum);
int width = indeterminate ? maxWidth : qMax(minWidth, progressBarWidth);
bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical;
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 53f3db9..660b4c3 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -2076,7 +2076,7 @@ void QGtkStyle::drawControl(ControlElement element,
if (vertical)
rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height
const int progressIndicatorPos = (bar->progress - qreal(bar->minimum)) * rect.width() /
- qMax(1.0, qreal(bar->maximum) - bar->minimum);
+ qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum);
if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width())
leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height());
if (vertical)