diff options
| author | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2015-04-23 12:30:33 +0300 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2015-04-23 12:54:21 +0300 |
| commit | 143be951b1fe8316b0dffb9010810c9cb1941ee0 (patch) | |
| tree | ea1c19d7641f97e48772354ef9b4483383ba2110 /src/charts/axis/chartaxiselement.cpp | |
| parent | 7b74d88b3f3df27d3f74e88e2ceed75b65bce2e5 (diff) | |
Fix QNX build issue
Use qmath and cmath methods instead of math.h methods.
Change-Id: I7c853f2e1218a1d3cde15a089192c24a6b0b1395
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/charts/axis/chartaxiselement.cpp')
| -rw-r--r-- | src/charts/axis/chartaxiselement.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index be07d143..d2ff57fc 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -23,6 +23,7 @@ #include <QtCore/QtMath> #include <QtCore/QDateTime> #include <QtGui/QTextDocument> +#include <cmath> QT_CHARTS_BEGIN_NAMESPACE @@ -271,7 +272,7 @@ QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks, return labels; if (format.isNull()) { - int n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0) + 1; + int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0) + 1; for (int i = 0; i < ticks; i++) { qreal value = min + (i * (max - min) / (ticks - 1)); labels << presenter()->numberToString(value, 'f', n); @@ -318,14 +319,14 @@ QStringList ChartAxisElement::createLogValueLabels(qreal min, qreal max, qreal b int firstTick; if (base > 1) - firstTick = ceil(log10(min) / log10(base)); + firstTick = qCeil(std::log10(min) / std::log10(base)); else - firstTick = ceil(log10(max) / log10(base)); + firstTick = qCeil(std::log10(max) / std::log10(base)); if (format.isNull()) { int n = 0; if (ticks > 1) - n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0); + n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0); n++; for (int i = firstTick; i < ticks + firstTick; i++) { qreal value = qPow(base, i); @@ -371,7 +372,7 @@ QStringList ChartAxisElement::createDateTimeLabels(qreal min, qreal max,int tick if (max <= min || ticks < 1) return labels; - int n = qMax(int(-floor(log10((max - min) / (ticks - 1)))), 0); + int n = qMax(int(-qFloor(std::log10((max - min) / (ticks - 1)))), 0); n++; for (int i = 0; i < ticks; i++) { qreal value = min + (i * (max - min) / (ticks - 1)); |