Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
a701991c
Commit
a701991c
authored
Dec 19, 2017
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move code to use QT_VERSION_CHECK
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
09a9deb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
QGeoTiledMappingManagerEngineQGC.cpp
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
+7
-7
QGeoTiledMappingManagerEngineQGC.h
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h
+4
-4
No files found.
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
View file @
a701991c
...
...
@@ -50,11 +50,11 @@
#include <QtLocation/private/qgeocameracapabilities_p.h>
#include <QtLocation/private/qgeomaptype_p.h>
#if QT_VERSION <
0x050500
#if QT_VERSION <
QT_VERSION_CHECK(5, 5, 0)
#include <QtLocation/private/qgeotiledmapdata_p.h>
#else
#include <QtLocation/private/qgeotiledmap_p.h>
#if QT_VERSION >=
0x050600
#if QT_VERSION >=
QT_VERSION_CHECK(5, 6, 0)
#include <QtLocation/private/qgeofiletilecache_p.h>
#else
#include <QtLocation/private/qgeotilecache_p.h>
...
...
@@ -64,7 +64,7 @@
#include <QDir>
#include <QStandardPaths>
#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
&
parameters
)
...
...
@@ -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
...
...
src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h
View file @
a701991c
...
...
@@ -48,12 +48,12 @@
#define QGEOTILEDMAPPINGMANAGERENGINEQGC_H
#include <QtLocation/QGeoServiceProvider>
#if QT_VERSION >=
0x050500
#if QT_VERSION >=
QT_VERSION_CHECK(5, 5, 0)
#include <QtLocation/private/qgeotiledmap_p.h>
#endif
#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
#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
&
parameters
,
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
&
parameters
);
#endif
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment