From 511a17a6bb3f4aa9b0f4e1b5fad6f8ed9dc9ea69 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Mon, 6 Jun 2022 13:51:08 +0100
Subject: [PATCH] Map: Default to mapboxgl for Qt 5.15.3, as osm doesn't work

---
 plugins/feature/map/mapsettings.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/feature/map/mapsettings.cpp b/plugins/feature/map/mapsettings.cpp
index 8df0b3501..866499b49 100644
--- a/plugins/feature/map/mapsettings.cpp
+++ b/plugins/feature/map/mapsettings.cpp
@@ -83,7 +83,11 @@ 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
+#else
     m_mapProvider = "osm";
+#endif
     m_thunderforestAPIKey = "";
     m_maptilerAPIKey = "";
     m_mapBoxAPIKey = "";
@@ -169,7 +173,11 @@ 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
+#else
         d.readString(2, &m_mapProvider, "osm");
+#endif
         d.readString(3, &m_mapBoxAPIKey, "");
         d.readString(4, &m_mapBoxStyles, "");
         d.readString(8, &m_title, "Map");