From 9c846f363c06ceea555ddd3c9a0eecec7808efa7 Mon Sep 17 00:00:00 2001 From: CRD716 Date: Tue, 2 Aug 2022 16:46:50 -0500 Subject: [PATCH] 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