HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2613:1a7a17f8e2cd

Fix Chart build on Solaris...

Titta Heikkala -

r2613:1a7a17f8e2cd

parent child

Context file:

r2613:1a7a17f8e2cd

demos/chartinteractions/chart.cpp +2 -2

             #include "chart.h"
             #include <QValueAxis>
             #include <QAbstractAxis>
-            #include <cmath>
+            #include <qmath.h>
             Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
                 : QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(series)
             qreal Chart::distance(const QPointF &p1, const QPointF &p2)
             {
-                return sqrt((p1.x() - p2.x()) * (p1.x() - p2.x())
+                return qSqrt((p1.x() - p2.x()) * (p1.x() - p2.x())
                             + (p1.y() - p2.y()) * (p1.y() - p2.y()));
             }

demos/qmloscilloscope/datasource.cpp +2 -2

             #include <QAreaSeries>
             #include <QDeclarativeView>
             #include <QDebug>
-            #include <cmath>
+            #include <qmath.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
                         switch (type) {
                         case 0:
                             // data with sin + random component
-                            y = sin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX;
+                            y = qSin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX;
                             x = j;
                             break;
                         case 1:

demos/quick2oscilloscope/datasource.cpp +2 -2

             #include <QtQuick/QQuickView>
             #include <QtQuick/QQuickItem>
             #include <QDebug>
-            #include <cmath>
+            #include <qmath.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
                         switch (type) {
                         case 0:
                             // data with sin + random component
-                            y = sin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX;
+                            y = qSin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX;
                             x = j;
                             break;
                         case 1:

examples/scatterinteractions/chartview.cpp +5 -3

             ****************************************************************************/
             #include "chartview.h"
-            #include <math.h>
+            #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QPointF closest(INT_MAX, INT_MAX);
                 qreal distance(INT_MAX);
                 foreach (QPointF currentPoint, m_scatter->points()) {
-                    qreal currentDistance = sqrt((currentPoint.x() - clickedPoint.x()) * (currentPoint.x() - clickedPoint.x())
+                    qreal currentDistance = qSqrt((currentPoint.x() - clickedPoint.x())
-                                                 + (currentPoint.y() - clickedPoint.y()) * (currentPoint.y() - clickedPoint.y()));
+                                                  * (currentPoint.x() - clickedPoint.x())
+                                                  + (currentPoint.y() - clickedPoint.y())
+                                                  * (currentPoint.y() - clickedPoint.y()));
                     if (currentDistance < distance) {
                         distance = currentDistance;
                         closest = currentPoint;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages