summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-08 22:53:44 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-08 22:53:44 (GMT)
commitf64ef46fdb49c609a434ad92ce01ee40116d6545 (patch)
tree88e3cb4dc26b53ba38f8e7e0c095bb131abf671c
parent7475ea3c1c883375843d6935d18edba4d3aa15e2 (diff)
downloadQt-f64ef46fdb49c609a434ad92ce01ee40116d6545.zip
Qt-f64ef46fdb49c609a434ad92ce01ee40116d6545.tar.gz
Qt-f64ef46fdb49c609a434ad92ce01ee40116d6545.tar.bz2
Compile fix for WinCE.
-rw-r--r--src/declarative/fx/qfxreflectionfilter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxreflectionfilter.cpp b/src/declarative/fx/qfxreflectionfilter.cpp
index 2e57aa7..c66deb7 100644
--- a/src/declarative/fx/qfxreflectionfilter.cpp
+++ b/src/declarative/fx/qfxreflectionfilter.cpp
@@ -239,7 +239,7 @@ void QFxReflectionFilter::setScale(qreal s)
update();
}
-static inline float min(float a, float b)
+static inline float floatmin(float a, float b)
{
return (a < b)?a:b;
}
@@ -257,7 +257,7 @@ void QFxReflectionFilter::filterGL(QSimpleCanvasItem::GLPainter &p)
float refHeight = height;
if (d->height > 0)
- refHeight = min(height, d->height);
+ refHeight = floatmin(height, d->height);
QSimpleCanvas::Matrix simpMat;
QSimpleCanvasItem *simpItem = 0;