diff options
4 files changed, 7 insertions, 9 deletions
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp index f0ba122c..841c29a8 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp @@ -140,8 +140,6 @@ QT_BEGIN_NAMESPACE \since 5.14 */ -static const int CircleSamples = 128; - struct Vertex { QVector2D position; diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 875b8e47..9fa50794 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1628,7 +1628,7 @@ void QDeclarativeGeoMap::clearData() void QDeclarativeGeoMap::fitViewportToGeoShape(const QGeoShape &shape, QVariant margins) { QMargins m(10, 10, 10, 10); // lets defaults to 10 if margins is invalid - switch (margins.type()) { + switch (static_cast<QMetaType::Type>(margins.type())) { case QMetaType::Int: case QMetaType::Double: { const int value = int(margins.toDouble()); diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h index 2a588222..2a921e29 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h @@ -394,7 +394,7 @@ public: "}"; } - const char *fragmentShader() const { + const char *fragmentShader() const override { return "uniform lowp vec4 color; \n" "void main() { \n" diff --git a/src/positioning/qdoublematrix4x4.cpp b/src/positioning/qdoublematrix4x4.cpp index 32cc7f1f..0bc56460 100644 --- a/src/positioning/qdoublematrix4x4.cpp +++ b/src/positioning/qdoublematrix4x4.cpp @@ -1072,12 +1072,12 @@ QDebug operator<<(QDebug dbg, const QDoubleMatrix4x4 &m) } // Output in row-major order because it is more human-readable. - dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << endl + dbg.nospace() << "QDoubleMatrix4x4(type:" << bits.constData() << Qt::endl << qSetFieldWidth(10) - << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << endl - << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << endl - << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << endl - << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << endl + << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << Qt::endl + << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << Qt::endl + << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << Qt::endl + << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << Qt::endl << qSetFieldWidth(0) << ')'; return dbg; } |