From d0a94ede0cfb2edb7068975fdf01e03087943b59 Mon Sep 17 00:00:00 2001 From: CRD716 Date: Tue, 2 Aug 2022 16:31:43 -0500 Subject: [PATCH 1/3] Fix QT 5.15.4 map hang --- plugins/channelrx/demodadsb/adsbdemodsettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp index f6b7ebba4..debdbdbc3 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp @@ -315,8 +315,8 @@ bool ADSBDemodSettings::deserialize(const QByteArray& data) d.readBlob(60, &m_geometryBytes); d.readBool(61, &m_hidden, false); d.readString(62, &m_checkWXAPIKey, ""); -#if QT_VERSION == QT_VERSION_CHECK(5, 15, 3) - d.readString(63, &m_mapProvider, "mapboxgl"); // osm maps do not work in Qt 5.15.3 - https://github.com/f4exb/sdrangel/issues/1169 +#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/4 - https://github.com/f4exb/sdrangel/issues/1169 #else d.readString(63, &m_mapProvider, "osm"); #endif From 0ce935b5547e33cafe293b250b34318b616644d6 Mon Sep 17 00:00:00 2001 From: CRD716 Date: Tue, 2 Aug 2022 16:44:49 -0500 Subject: [PATCH 2/3] i forgor --- plugins/channelrx/demodadsb/adsbdemodsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp index debdbdbc3..e2ee3c3ab 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp @@ -92,7 +92,7 @@ void ADSBDemodSettings::resetToDefaults() m_logEnabled = false; m_airspaces = QStringList({"A", "D", "TMZ"}); 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 #else m_mapProvider = "osm"; From 9c846f363c06ceea555ddd3c9a0eecec7808efa7 Mon Sep 17 00:00:00 2001 From: CRD716 Date: Tue, 2 Aug 2022 16:46:50 -0500 Subject: [PATCH 3/3] Fix map feature 5.15.4 check --- plugins/feature/map/mapsettings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/feature/map/mapsettings.cpp b/plugins/feature/map/mapsettings.cpp index 192654b8d..b9eaff565 100644 --- a/plugins/feature/map/mapsettings.cpp +++ b/plugins/feature/map/mapsettings.cpp @@ -88,8 +88,8 @@ MapSettings::~MapSettings() void MapSettings::resetToDefaults() { 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 +#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/4 - https://github.com/f4exb/sdrangel/issues/1169 #else m_mapProvider = "osm"; #endif @@ -183,8 +183,8 @@ bool MapSettings::deserialize(const QByteArray& data) QByteArray blob; 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 +#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/4 - https://github.com/f4exb/sdrangel/issues/1169 #else d.readString(2, &m_mapProvider, "osm"); #endif