VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-22 07:22:27 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1370 from CRD716/master

Browse Source 
Fix QT 5.15.4 map hang
This commit is contained in:
Edouard Griffiths 2022-08-03 09:32:35 +02:00 committed by GitHub
commit 2588a7faea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/demodadsb/adsbdemodsettings.cpp
View File

@ -92,7 +92,7 @@ void ADSBDemodSettings::resetToDefaults()
m_logEnabled = false; m_logEnabled = false;
m_airspaces = QStringList({"A", "D", "TMZ"}); m_airspaces = QStringList({"A", "D", "TMZ"});
m_airspaceRange = 500.0f; m_airspaceRange = 500.0f;
#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 - https://github.com/f4exb/sdrangel/issues/1169
#else #else
m_mapProvider = "osm"; m_mapProvider = "osm";
@ -315,8 +315,8 @@ bool ADSBDemodSettings::deserialize(const QByteArray& data)
d.readBlob(60, &m_geometryBytes); d.readBlob(60, &m_geometryBytes);
d.readBool(61, &m_hidden, false); d.readBool(61, &m_hidden, false);
d.readString(62, &m_checkWXAPIKey, ""); d.readString(62, &m_checkWXAPIKey, "");
#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(63, &m_mapProvider, "mapboxgl"); // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169 d.readString(63, &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(63, &m_mapProvider, "osm"); d.readString(63, &m_mapProvider, "osm");
#endif #endif

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