diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index 3a74c28017a86164f0d7eba6e0fac88f911b16b7..871f3ab6299f73d0d839ff474d3085e4719302cd 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp @@ -50,11 +50,11 @@ #include #include -#if QT_VERSION < 0x050500 +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #include #else #include -#if QT_VERSION >= 0x050600 +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #include #else #include @@ -64,7 +64,7 @@ #include #include -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) //----------------------------------------------------------------------------- QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent) : QGeoTiledMap(engine, parent) @@ -165,7 +165,7 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian getQGCMapEngine()->setUserAgent(parameters.value(QStringLiteral("useragent")).toString().toLatin1()); } -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) _setCache(parameters); #endif @@ -180,7 +180,7 @@ QGeoTiledMappingManagerEngineQGC::~QGeoTiledMappingManagerEngineQGC() { } -#if QT_VERSION < 0x050500 +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) //----------------------------------------------------------------------------- QGeoMapData *QGeoTiledMappingManagerEngineQGC::createMapData() @@ -199,7 +199,7 @@ QGeoTiledMappingManagerEngineQGC::createMap() #endif -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) //----------------------------------------------------------------------------- void QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters) @@ -242,7 +242,7 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap ¶meters) if(memLimit > 1024 * 1024 * 1024) memLimit = 1024 * 1024 * 1024; //-- Disable Qt's disk cache (sort of) -#if QT_VERSION >= 0x050600 +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) QAbstractGeoTileCache *pTileCache = new QGeoFileTileCache(cacheDir); setTileCache(pTileCache); #else diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h index f3fe98aaba5487982202be636adefb231255a0ad..b434b7c6597ac6276c126109588d8e31609582bf 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h @@ -48,12 +48,12 @@ #define QGEOTILEDMAPPINGMANAGERENGINEQGC_H #include -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) #include #endif #include -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) class QGeoTiledMapQGC : public QGeoTiledMap { Q_OBJECT @@ -70,13 +70,13 @@ class QGeoTiledMappingManagerEngineQGC : public QGeoTiledMappingManagerEngine public: QGeoTiledMappingManagerEngineQGC(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoTiledMappingManagerEngineQGC(); -#if QT_VERSION < 0x050500 +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) QGeoMapData *createMapData(); #else QGeoMap *createMap(); #endif private: -#if QT_VERSION >= 0x050500 +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) void _setCache(const QVariantMap ¶meters); #endif };