Merge pull request #1654 from srcejon/qt6

Fix Qt6 compilation

plugins/channelrx/demodnavtex/navtexdemodsink.cpp

@@ -355,7 +355,7 @@ void NavtexDemodSink::receiveBit(bool bit)
                         getMessageQueueToChannel()->push(msg);
                     }
                     // Add character to message buffer
-                    m_messageBuffer.append(c);
+                    m_messageBuffer.append(QChar(c));
                 }
                 else
                 {

plugins/channelrx/heatmap/heatmapgui.cpp

@@ -695,7 +695,7 @@ void HeatMapGUI::displaySettings()
 
     value = (int)std::log10(m_settings.m_sampleRate);
     ui->sampleRate->setValue(value);
-    int idx = std::min(std::max(0, value-2), m_sampleRateTexts.size() - 1);
+    int idx = std::min(std::max(0, value-2), (int)m_sampleRateTexts.size() - 1);
     ui->sampleRateText->setText(m_sampleRateTexts[idx]);
     ui->averagePeriod->setMinimum(std::max(1, static_cast<int> (m_averagePeriodTexts.size()) - value));
 

sdrbase/maincore.cpp

@@ -358,10 +358,12 @@ void MainCore::initPosition()
     if (m_positionSource)
     {
         connect(m_positionSource, &QGeoPositionInfoSource::positionUpdated, this, &MainCore::positionUpdated);
-        #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         connect(m_positionSource, &QGeoPositionInfoSource::updateTimeout, this, &MainCore::positionUpdateTimeout);
-        #endif
         connect(m_positionSource, qOverload<QGeoPositionInfoSource::Error>(&QGeoPositionInfoSource::error), this, &MainCore::positionError);
+#else
+        connect(m_positionSource, &QGeoPositionInfoSource::errorOccurred, this, &MainCore::positionError);
+#endif
         m_position = m_positionSource->lastKnownPosition();
         m_positionSource->setUpdateInterval(1000);
         m_positionSource->startUpdates();