Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp

Change-Id: I2bf1657c6dd3b73e654e7db8bdadadfb293e2180

6 files changed, 20 insertions, 18 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 8af789b8..7bb37623 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -81,7 +81,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class QLocationDeclarativeModule: public QQmlExtensionPlugin
+class QtLocationDeclarativeModule: public QQmlExtensionPlugin
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qmldir b/src/imports/location/qmldir
index f802a4a1..37ecf66c 100644
--- a/src/imports/location/qmldir
+++ b/src/imports/location/qmldir
@@ -1,3 +1,4 @@
 module QtLocation
 plugin declarative_location
+classname QtLocationDeclarativeModule
 typeinfo plugins.qmltypes
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 36a731db..7b213960 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -85,7 +85,7 @@ static LocationValueTypeProvider *getValueTypeProvider()
     return &provider;
 }
 
-class QLocationDeclarativeModule: public QQmlExtensionPlugin
+class QtPositioningDeclarativeModule: public QQmlExtensionPlugin
 {
     Q_OBJECT
 
diff --git a/src/imports/positioning/qmldir b/src/imports/positioning/qmldir
index 4143e0d5..fc4ebf85 100644
--- a/src/imports/positioning/qmldir
+++ b/src/imports/positioning/qmldir
@@ -1,3 +1,4 @@
 module QtPositioning
 plugin declarative_positioning
+classname QtPositioningDeclarativeModule
 typeinfo plugins.qmltypes
diff --git a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
index 1daaae05..be216dfe 100644
--- a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
+++ b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
@@ -77,7 +77,7 @@ class tst_QGeoCameraTiles : public QObject
 private:
     void row(const PositionTestInfo &pti, int xOffset, int yOffset, int tileX, int tileY, int tileW, int tileH)
     {
-        double step = 1 / (pow(2.0, 4.0) * 4);
+        double step = 1 / (std::pow(2.0, 4.0) * 4);
 
         QString row = pti.xyString;
         row += QStringLiteral(" - ");
@@ -239,14 +239,14 @@ private slots:
         ct.setMaximumZoomLevel(8);
         ct.setTileSize(16);
         ct.setCamera(camera);
-        ct.setScreenSize(QSize(ceil(width), ceil(height)));
+        ct.setScreenSize(QSize(std::ceil(width), std::ceil(height)));
 
         QSet<QGeoTileSpec> tiles;
 
         QVERIFY2(tilesX.size() == tilesY.size(), "tilesX and tilesY have different size");
 
         for (int i = 0; i < tilesX.size(); ++i)
-            tiles.insert(QGeoTileSpec("", 0, static_cast<int>(floor(zoom)), tilesX.at(i), tilesY.at(i)));
+            tiles.insert(QGeoTileSpec("", 0, static_cast<int>(std::floor(zoom)), tilesX.at(i), tilesY.at(i)));
 
         QCOMPARE(ct.tiles(), tiles);
     }
@@ -556,8 +556,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
@@ -800,8 +800,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
@@ -1044,8 +1044,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
@@ -1287,8 +1287,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
@@ -1532,8 +1532,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
@@ -1776,8 +1776,8 @@ private slots:
 
         pti.zoom = 4.5;
         pti.zoomString = QStringLiteral("frac zoom");
-        pti.w = pti.w * pow(2.0, 0.5);
-        pti.h = pti.h * pow(2.0, 0.5);
+        pti.w = pti.w * std::pow(2.0, 0.5);
+        pti.h = pti.h * std::pow(2.0, 0.5);
 
         pti.x = 0.5;
         pti.y = 0.5;
diff --git a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp b/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
index 6a69c6d1..26d19aaa 100644
--- a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
+++ b/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
@@ -91,7 +91,7 @@ class tst_QGeoMapScene : public QObject
         double mercatorX;
         double mercatorY;
 
-        double halfLength = 1 / (pow(2.0, zoom) * 2);
+        double halfLength = 1 / (std::pow(2.0, zoom) * 2);
         double scaleX = screenWidth / tileSize;
         double scaleY = screenHeight / tileSize;
         double scaledHalfLengthX = halfLength * scaleX;