summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-04-13 15:00:41 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-04-13 15:00:41 (GMT)
commit69a13ce889ce32f118a0f65c7fcc97cca3791372 (patch)
tree57921a0ccc65a09c7b4980e3cb9a6a88507c61bd /src/3rdparty
parent5de6b5b90e56e325d8972c4eed2ce8df2f716a76 (diff)
downloadQt-69a13ce889ce32f118a0f65c7fcc97cca3791372.zip
Qt-69a13ce889ce32f118a0f65c7fcc97cca3791372.tar.gz
Qt-69a13ce889ce32f118a0f65c7fcc97cca3791372.tar.bz2
Revert "removed a few warnings on wince builds"
This reverts commit 6b2cf497268037a5c127affeef3e6efd055164ec.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/easing/easing.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/easing/easing.cpp b/src/3rdparty/easing/easing.cpp
index 3cc71fa..7d70a4d 100644
--- a/src/3rdparty/easing/easing.cpp
+++ b/src/3rdparty/easing/easing.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Disclaimer for Robert Penner's Easing Equations license:
TERMS OF USE - EASING EQUATIONS
@@ -554,13 +554,13 @@ static qreal easeOutBounce_helper(qreal t, qreal c, qreal a)
if (t < (4/11.0)) {
return c*(7.5625*t*t);
} else if (t < (8/11.0)) {
- t -= qreal(6/11.0);
+ t -= (6/11.0);
return -a * (1. - (7.5625*t*t + .75)) + c;
} else if (t < (10/11.0)) {
- t -= qreal(9/11.0);
+ t -= (9/11.0);
return -a * (1. - (7.5625*t*t + .9375)) + c;
} else {
- t -= qreal(21/22.0);
+ t -= (21/22.0);
return -a * (1. - (7.5625*t*t + .984375)) + c;
}
}