diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
| commit | 97bb01ce5d85ac94ed019f0abd7a08917ae4f80a (patch) | |
| tree | 2974b3181e1020c0b26e2e75375e6af73afad781 /tests/manual | |
| parent | bbf52870f4e335c0d169907d4398a12cb41ca3a1 (diff) | |
| parent | 35b800491709bafb58c3c8e29f953954f2a7897a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
.qmake.conf
README
src/charts/qchartglobal.h
Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/chartwidgettest/mainwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index 062e04f1..79530bb7 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -216,9 +216,9 @@ QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QStr QList <qreal> newColumn; for (int i(0); i < rowCount; i++) { if (dataCharacteristics == "Sin") { - newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100)); } else if (dataCharacteristics == "Sin + random") { - newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); + newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); } else if (dataCharacteristics == "Random") { newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); } else if (dataCharacteristics == "Linear") { |