summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Martins <sergio.martins@kdab.com>2015-03-28 17:51:38 +0000
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-03-29 00:42:31 +0000
commit15daa5fe1c347b0cad80e46c1aafe1de728c3c06 (patch)
tree155e5c744a652487e39088ec1c49050b72b0558c
parent73d6bdb9b2f2a9708c5fff64506ff04865dd17a6 (diff)
Fix Blackberry and QNX 6.6 build
Change-Id: I647f478f9b888ed2bcdbda263446b82165c957e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp2
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp2
-rw-r--r--src/declarative/util/qdeclarativestateoperations.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 27059a2f..33ebc4d4 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2719,7 +2719,7 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
}
if (scale != 0)
- rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
+ rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
else {
qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under scale of 0");
ok = false;
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 321a2a96..317e3eb2 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -103,7 +103,7 @@ bool QSmoothedAnimation::recalc()
return false;
}
- finalDuration = ceil(tf * qreal(1000.0));
+ finalDuration = std::ceil(tf * qreal(1000.0));
if (maximumEasingTime == 0) {
a = 0;
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 02ac38e2..02f4622d 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -115,7 +115,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
}
if (scale != 0)
- rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
+ rotation = qAtan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
else {
qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under scale of 0");
ok = false;