VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Support Map plugin for Qt 6.5. Some Qt 6.6 fixes.

Browse Source
This commit is contained in:
Jon Beniston
2023-08-06 09:08:53 +01:00
parent 958078c37b
commit 5567c708e7
15 changed files with 690 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/map/mapsettings.cpp
+2 -2
View File
@@ -152,7 +152,7 @@ MapSettings::~MapSettings()
void MapSettings::resetToDefaults()
{
m_displayNames = true;
#ifdef LINUX
#if defined(LINUX) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
m_mapProvider = "mapboxgl"; // osm maps do not work in some versions of Linux https://github.com/f4exb/sdrangel/issues/1169 & 1369
#else
m_mapProvider = "osm";
@@ -252,7 +252,7 @@ bool MapSettings::deserialize(const QByteArray& data)
d.readBool(1, &m_displayNames, true);
d.readString(2, &m_mapProvider, "osm");
#ifdef LINUX
#if defined(LINUX) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
if (m_mapProvider == "osm") {
m_mapProvider = "mapboxgl";
}