Fix build of tests on QNX.

Change-Id: Ib28e42e3eb10e26555fe392c55534f715bee5f8b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

4 files changed, 54 insertions, 54 deletions

diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 3d0b102b1c..8ffe4d8dfe 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -385,14 +385,14 @@ void tst_QtConcurrentRun::recursive()
         count.store(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveRun(levels);
-        QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
+        QCOMPARE(count.load(), (int)std::pow(2.0, levels) - 1);
     }
 
     for (int i = 0; i < QThread::idealThreadCount(); ++i) {
         count.store(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveResult(levels);
-        QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
+        QCOMPARE(count.load(), (int)std::pow(2.0, levels) - 1);
     }
 }
 
diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index b33982695b..8726f77e58 100644
--- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
@@ -753,7 +753,7 @@ void tst_QEasingCurve::testCbrtDouble()
         if (f != 0.0)
             t = t * (t_cubic + d + d) / f;
 
-        double expected = pow(d, 1.0/3.0);
+        double expected = std::pow(d, 1.0/3.0);
 
         const qreal error = qAbs(expected - t);
 
@@ -779,7 +779,7 @@ void tst_QEasingCurve::testCbrtFloat()
         if (fac != 0.0f)
             t = t * (t_cubic + f + f) / fac;
 
-        float expected = pow(f, float(1.0/3.0));
+        float expected = std::pow(f, float(1.0/3.0));
 
         const qreal error = qAbs(expected - t);
 
diff --git a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
index 436cedcca7..ff58c9b181 100644
--- a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
+++ b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
@@ -275,12 +275,12 @@ void tst_QPointF::division()
 {
     {
         QPointF p(1e-14, 1e-14);
-        p = p / sqrt(dot(p, p));
+        p = p / std::sqrt(dot(p, p));
         QCOMPARE(dot(p, p), qreal(1.0));
     }
     {
         QPointF p(1e-14, 1e-14);
-        p /= sqrt(dot(p, p));
+        p /= std::sqrt(dot(p, p));
         QCOMPARE(dot(p, p), qreal(1.0));
     }
 }
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index a1017eea3b..c4c4789b7a 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -152,125 +152,125 @@ void tst_QWMatrix::mapping_data()
 
     // rotations
     float deg = 0.;
-    QTest::newRow( "rot 0 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 0 a" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                            std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                 << QRect( 0, 0, 30, 40 )
                                 << QPolygon ( QRect( 0, 0, 30, 40 ) );
     deg = 0.00001f;
-    QTest::newRow( "rot 0 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 0 b" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                            std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                 << QRect( 0, 0, 30, 40 )
                                 << QPolygon ( QRect( 0, 0, 30, 40 ) );
     deg = 0.;
-    QTest::newRow( "rot 0 c" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 0 c" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                            std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                 << QRect( 10, 20, 30, 40 )
                                 << QPolygon ( QRect( 10, 20, 30, 40 ) );
     deg = 0.00001f;
-    QTest::newRow( "rot 0 d" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 0 d" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                            std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                 << QRect( 10, 20, 30, 40 )
                                 << QPolygon ( QRect( 10, 20, 30, 40 ) );
 
 #if 0
     // rotations
     deg = 90.;
-    QTest::newRow( "rotscale 90 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 90 a" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                  10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                       << QRect( 0, 0, 30, 40 )
                                       << QPolygon( QRect( 0, -299, 400, 300 ) );
     deg = 90.00001;
-    QTest::newRow( "rotscale 90 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 90 b" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                  10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                       << QRect( 0, 0, 30, 40 )
                                       << QPolygon( QRect( 0, -299, 400, 300 ) );
     deg = 90.;
-    QTest::newRow( "rotscale 90 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 90 c" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                  10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                       << QRect( 10, 20, 30, 40 )
                                       << QPolygon( QRect( 200, -399, 400, 300 ) );
     deg = 90.00001;
-    QTest::newRow( "rotscale 90 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 90 d" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                  10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                       << QRect( 10, 20, 30, 40 )
                                       << QPolygon( QRect( 200, -399, 400, 300 ) );
 
     deg = 180.;
-    QTest::newRow( "rotscale 180 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 180 a" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 0, 0, 30, 40 )
                                        << QPolygon( QRect( -299, -399, 300, 400 ) );
     deg = 180.000001;
-    QTest::newRow( "rotscale 180 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 180 b" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 0, 0, 30, 40 )
                                        << QPolygon( QRect( -299, -399, 300, 400 ) );
     deg = 180.;
-    QTest::newRow( "rotscale 180 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 180 c" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 10, 20, 30, 40 )
                                        << QPolygon( QRect( -399, -599, 300, 400 ) );
     deg = 180.000001;
-    QTest::newRow( "rotscale 180 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 180 d" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 10, 20, 30, 40 )
                                        << QPolygon( QRect( -399, -599, 300, 400 ) );
 
     deg = 270.;
-    QTest::newRow( "rotscale 270 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 270 a" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 0, 0, 30, 40 )
                                        << QPolygon( QRect( -399, 00, 400, 300 ) );
     deg = 270.0000001;
-    QTest::newRow( "rotscale 270 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 270 b" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 0, 0, 30, 40 )
                                        << QPolygon( QRect( -399, 00, 400, 300 ) );
     deg = 270.;
-    QTest::newRow( "rotscale 270 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rotscale 270 c" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                        << QRect( 10, 20, 30, 40 )
                                        << QPolygon( QRect( -599, 100, 400, 300 ) );
     deg = 270.000001;
-    QTest::newRow( "rotscale 270 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0,   0 )
+    QTest::newRow( "rotscale 270 d" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                                   10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0,   0 )
                                        << QRect( 10, 20, 30, 40 )
                                        << QPolygon( QRect( -599, 100, 400, 300 ) );
 
     // rotations that are not multiples of 90 degrees. mapRect returns the bounding rect here.
     deg = 45;
-    QTest::newRow( "rot 45 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                             sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 45 a" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                             std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                  << QRect( 0, 0, 10, 10 )
                                  << QPolygon( QRect( 0, -7, 14, 14 ) );
-    QTest::newRow( "rot 45 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                             sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 45 b" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                             std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                  << QRect( 10, 20, 30, 40 )
                                  << QPolygon( QRect( 21, -14, 49, 49 ) );
-    QTest::newRow( "rot 45 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                             10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 45 c" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                             10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                  << QRect( 0, 0, 10, 10 )
                                  << QPolygon( QRect( 0, -70, 141, 141 ) );
-    QTest::newRow( "rot 45 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                             10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot 45 d" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                             10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                  << QRect( 10, 20, 30, 40 )
                                  << QPolygon( QRect( 212, -141, 495, 495 ) );
 
     deg = -45;
-    QTest::newRow( "rot -45 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                              sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot -45 a" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                              std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                   << QRect( 0, 0, 10, 10 )
                                   << QPolygon( QRect( -7, 0, 14, 14 ) );
-    QTest::newRow( "rot -45 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-                                              sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot -45 b" )  << QMatrix( std::cos( M_PI*deg/180. ), -std::sin( M_PI*deg/180. ),
+                                              std::sin( M_PI*deg/180. ),  std::cos( M_PI*deg/180. ), 0, 0 )
                                   << QRect( 10, 20, 30, 40 )
                                   << QPolygon( QRect( -35, 21, 49, 49 ) );
-    QTest::newRow( "rot -45 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                              10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot -45 c" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                              10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                   << QRect( 0, 0, 10, 10 )
                                   << QPolygon( QRect( -70, 0, 141, 141 ) );
-    QTest::newRow( "rot -45 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-                                              10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+    QTest::newRow( "rot -45 d" )  << QMatrix( 10*std::cos( M_PI*deg/180. ), -10*std::sin( M_PI*deg/180. ),
+                                              10*std::sin( M_PI*deg/180. ),  10*std::cos( M_PI*deg/180. ), 0, 0 )
                                   << QRect( 10, 20, 30, 40 )
                                   << QPolygon( QRect( -353, 212, 495, 495 ) );
 #endif