VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 15:17:48 -04:00
Code Issues Projects Releases Wiki Activity

Map: Default to mapboxgl for Qt 5.15.3, as osm doesn't work

Browse Source
This commit is contained in:
Jon Beniston 2022-06-06 13:51:08 +01:00
parent 8a7113be19
commit 511a17a6bb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/feature/map/mapsettings.cpp
View File

@ -83,7 +83,11 @@ MapSettings::~MapSettings()
void MapSettings::resetToDefaults() void MapSettings::resetToDefaults()
{ {
m_displayNames = true; m_displayNames = true;
#if QT_VERSION == QT_VERSION_CHECK(5, 15, 3)
m_mapProvider = "mapboxgl"; // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169
#else
m_mapProvider = "osm"; m_mapProvider = "osm";
#endif
m_thunderforestAPIKey = ""; m_thunderforestAPIKey = "";
m_maptilerAPIKey = ""; m_maptilerAPIKey = "";
m_mapBoxAPIKey = ""; m_mapBoxAPIKey = "";
@ -169,7 +173,11 @@ bool MapSettings::deserialize(const QByteArray& data)
QByteArray blob; QByteArray blob;
d.readBool(1, &m_displayNames, true); d.readBool(1, &m_displayNames, true);
#if QT_VERSION == QT_VERSION_CHECK(5, 15, 3)
d.readString(2, &m_mapProvider, "mapboxgl"); // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169
#else
d.readString(2, &m_mapProvider, "osm"); d.readString(2, &m_mapProvider, "osm");
#endif
d.readString(3, &m_mapBoxAPIKey, ""); d.readString(3, &m_mapBoxAPIKey, "");
d.readString(4, &m_mapBoxStyles, ""); d.readString(4, &m_mapBoxStyles, "");
d.readString(8, &m_title, "Map"); d.readString(8, &m_title, "Map");