summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-01-17 17:27:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-18 07:19:31 +0100
commite0484dca75de97c11f2aaad6df33e4de8aa733c0 (patch)
tree589414d4628eeebc842b42de1841caab3102a5ea
parente4d6488ffa46fb3505376d656835470675a59fef (diff)
QNX: Fix compilation of qdatetime.cpp
Adding std:: to pow() to make it compile for BlackBerry 10. Change-Id: I9ab3cc626eb2ba872c09df33cdb820b50d075428 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/tools/qdatetime.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 33a8ffa04c..6177012e4b 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1940,7 +1940,7 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
const long minuteFractionInt = minuteFractionStr.toLong(&ok);
if (!ok)
return QTime();
- const float minuteFraction = double(minuteFractionInt) / (pow(double(10), minuteFractionStr.count()));
+ const float minuteFraction = double(minuteFractionInt) / (std::pow(double(10), minuteFractionStr.count()));
const float secondWithMs = minuteFraction * 60;
const float secondNoMs = std::floor(secondWithMs);
@@ -1957,7 +1957,7 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
int msecInt = msecStr.isEmpty() ? 0 : msecStr.toInt(&ok);
if (!ok)
return QTime();
- const double secondFraction(msecInt / (pow(double(10), msecStr.count())));
+ const double secondFraction(msecInt / (std::pow(double(10), msecStr.count())));
msec = qMin(qRound(secondFraction * 1000.0), 999);
}
}