VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 13:47:50 -04:00
Code Issues Projects Releases Wiki Activity

Fix map feature 5.15.4 check

Browse Source
This commit is contained in:
CRD716 2022-08-02 16:46:50 -05:00 committed by GitHub
parent 0ce935b554
commit 9c846f363c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,8 +88,8 @@ MapSettings::~MapSettings()
void MapSettings::resetToDefaults() void MapSettings::resetToDefaults()
{ {
m_displayNames = true; m_displayNames = true;
#if QT_VERSION == QT_VERSION_CHECK(5, 15, 3) #if QT_VERSION == QT_VERSION_CHECK(5, 15, 3) || QT_VERSION == QT_VERSION_CHECK(5, 15, 4)
m_mapProvider = "mapboxgl"; // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169 m_mapProvider = "mapboxgl"; // osm maps do not work in Qt 5.15.3/4 - https://github.com/f4exb/sdrangel/issues/1169
#else #else
m_mapProvider = "osm"; m_mapProvider = "osm";
#endif #endif
@ -183,8 +183,8 @@ 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) #if QT_VERSION == QT_VERSION_CHECK(5, 15, 3) || QT_VERSION == QT_VERSION_CHECK(5, 15, 4)
d.readString(2, &m_mapProvider, "mapboxgl"); // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169 d.readString(2, &m_mapProvider, "mapboxgl"); // osm maps do not work in Qt 5.15.3/4 - https://github.com/f4exb/sdrangel/issues/1169
#else #else
d.readString(2, &m_mapProvider, "osm"); d.readString(2, &m_mapProvider, "osm");
#endif #endif