From 09a9deb3c6a5912a3222681a7bd968a7d30f4bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 19 Dec 2017 12:52:02 -0200 Subject: [PATCH 1/3] FlightDisplay/qmldir: Solve some file name typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/FlightDisplay/qmldir | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FlightDisplay/qmldir b/src/FlightDisplay/qmldir index 8968b79..f29069e 100644 --- a/src/FlightDisplay/qmldir +++ b/src/FlightDisplay/qmldir @@ -4,9 +4,9 @@ FlightDisplayView 1.0 FlightDisplayView.qml FlightDisplayViewMap 1.0 FlightDisplayViewMap.qml FlightDisplayViewVideo 1.0 FlightDisplayViewVideo.qml FlightDisplayViewWidgets 1.0 FlightDisplayViewWidgets.qml -GuidedActionsConfirm 1.0 GuidedActionsConfirm.qml +GuidedActionConfirm 1.0 GuidedActionConfirm.qml GuidedActionsController 1.0 GuidedActionsController.qml -GuidedActionsList 1.0 GuidedActionsList.qml +GuidedActionList 1.0 GuidedActionList.qml GuidedAltitudeSlider 1.0 GuidedAltitudeSlider.qml MultiVehicleList 1.0 MultiVehicleList.qml From a701991c5bca8baeb7cca4f4f72a1acc387c5303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 19 Dec 2017 12:52:37 -0200 Subject: [PATCH 2/3] Move code to use QT_VERSION_CHECK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp | 14 +++++++------- src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index 3a74c28..871f3ab 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 f3fe98a..b434b7c 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 }; From dff51b8d893f61dd15aae573f0945b31827c1bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Tue, 19 Dec 2017 12:53:21 -0200 Subject: [PATCH 3/3] QGeoTiledMappingManagerEngineQGC: Solve problem with Qt5.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp index 871f3ab..01463d0 100644 --- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp +++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp @@ -73,7 +73,9 @@ QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject } #endif -#if QT_VERSION >= 0x050900 +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl"), QGeoCameraCapabilities()) +#elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f,QByteArray("QGroundControl")) #else #define QGCGEOMAPTYPE(a,b,c,d,e,f) QGeoMapType(a,b,c,d,e,f)