Merge branch 'f4exb:master' into mac_ci

plugins/CMakeLists.txt

@@ -17,10 +17,18 @@ if (NOT SERVER_MODE)
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINS_DIR}")
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINS_DIR}")
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINS_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINS_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINS_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINS_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINS_DIR}")
+    if(WIN32 AND Qt6_FOUND)
+        # https://bugreports.qt.io/browse/QTBUG-124589
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINS_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINS_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINS_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINS_RUNTIME_DIR}")
+    else()
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINS_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINS_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINS_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINS_DIR}")
+    endif()
 else()
     if(WIN32)
         set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BUILD_PLUGINSSRV_RUNTIME_DIR}")
@@ -32,10 +40,17 @@ else()
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINSSRV_DIR}")
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINSSRV_DIR}")
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINSSRV_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINSSRV_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINSSRV_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINSSRV_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINSSRV_DIR}")
+    if(WIN32 AND Qt6_FOUND)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINSSRV_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINSSRV_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINSSRV_RUNTIME_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINSSRV_RUNTIME_DIR}")
+    else()
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PLUGINSSRV_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BUILD_PLUGINSSRV_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BUILD_PLUGINSSRV_DIR}")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BUILD_PLUGINSSRV_DIR}")
+    endif()
 endif()
 
 if (ENABLE_CHANNELMIMO)

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -5935,9 +5935,6 @@ void ADSBDemodGUI::applyImportSettings()
 void ADSBDemodGUI::import()
 {
     QString urlString = "https://";
-    if (!m_settings.m_importUsername.isEmpty() && !m_settings.m_importPassword.isEmpty()) {
-        urlString = urlString + m_settings.m_importUsername + ":" + m_settings.m_importPassword + "@";
-    }
     urlString = urlString + m_settings.m_importHost + "/api/states/all";
     QChar join = '?';
     if (!m_settings.m_importParameters.isEmpty())
@@ -5965,7 +5962,13 @@ void ADSBDemodGUI::import()
         urlString = urlString + join + "lomax=" + m_settings.m_importMaxLongitude;
         join = '&';
     }
-    m_networkManager->get(QNetworkRequest(QUrl(urlString)));
+    QNetworkRequest request = QNetworkRequest(QUrl(urlString));
+    if (!m_settings.m_importUsername.isEmpty() && !m_settings.m_importPassword.isEmpty())
+    {
+        QByteArray encoded = (m_settings.m_importUsername + ":" + m_settings.m_importPassword).toLocal8Bit().toBase64();
+        request.setRawHeader("Authorization", "Basic " + encoded);
+    }
+    m_networkManager->get(request);
 }
 
 // Handle opensky-network API call reply

plugins/channelrx/demodadsb/flags.qrc

@@ -205,7 +205,7 @@
     <file>flags/kazakhstan_mil.bmp</file>
     <file>flags/kenya.bmp</file>
     <file>flags/kenya_mil.bmp</file>
-    <file>flags/khazakstan.bmp</file>
+    <file>flags/kazakhstan.bmp</file>
     <file>flags/kiribati.bmp</file>
     <file>flags/korea_north.bmp</file>
     <file>flags/korea_north_mil.bmp</file>

plugins/channelrx/demodadsb/flags/regprefixmap.csv

@@ -105,7 +105,7 @@ JA,japan
 ZJ,jersey
 JY,jordan
 5Y,kenya
-UP,khazakstan
+UP,kazakhstan
 T3,kiribati
 P,korea_north
 HL,korea-south

plugins/channelrx/demodadsb/readme.md

@@ -133,7 +133,7 @@ As a server:
 The Beast binary and Hex formats are as detailed here: https://wiki.jetvision.de/wiki/Mode-S_Beast:Data_Output_Formats
 
 When Enable import is checked, aircraft data for aircraft anywhere in the world can be imported from OpenSky Network.
-A username and password are not required, but when specified, this allows the update period to be reduced to 5 seconds instead of 10 seconds.
+A username and password are not required, but when specified, this allows the update period to be reduced to 5 seconds instead of 10 seconds, and 4000 API calls per day instead of 400.
 To limit network traffic and processing power requirements, a geographical region can be set via the minimum and maximum latitude and longitude fields.
 
 <h3>17: Open Notifications Dialog</h3>

plugins/channelrx/demoddsc/CMakeLists.txt

@@ -27,10 +27,12 @@ if(NOT SERVER_MODE)
         ${demoddsc_SOURCES}
         dscdemodgui.cpp
         dscdemodgui.ui
+        coaststations.cpp
     )
     set(demoddsc_HEADERS
         ${demoddsc_HEADERS}
         dscdemodgui.h
+        coaststations.h
     )
 
     set(TARGET_NAME ${PLUGINS_PREFIX}demoddsc)