Merge 51665d49b2 into dac9b9a5b3

plugins/feature/map/mapbeacondialog.cpp

@@ -31,7 +31,6 @@ MapBeaconDialog::MapBeaconDialog(MapGUI *gui, QWidget* parent) :
     ui(new Ui::MapBeaconDialog)
 {
     ui->setupUi(this);
-    setAttribute(Qt::WA_QuitOnClose, false);
     connect(&m_dlm, &HttpDownloadManager::downloadComplete, this, &MapBeaconDialog::downloadFinished);
 }
 

plugins/feature/map/mapgui.cpp

@@ -2507,20 +2507,17 @@ void MapGUI::on_displaySettings_clicked()
 void MapGUI::on_beacons_clicked()
 {
     m_beaconDialog.show();
-    m_beaconDialog.raise();
 }
 
 void MapGUI::on_ibpBeacons_clicked()
 {
     m_ibpBeaconDialog.show();
-    m_ibpBeaconDialog.raise();
 }
 
 void MapGUI::on_radiotime_clicked()
 {
     m_radioTimeDialog.updateTable();
     m_radioTimeDialog.show();
-    m_radioTimeDialog.raise();
 }
 
 QString MapGUI::getDataDir()

plugins/feature/map/mapibpbeacondialog.cpp

@@ -30,9 +30,9 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
     ui(new Ui::MapIBPBeaconDialog)
 {
     ui->setupUi(this);
-    setAttribute(Qt::WA_QuitOnClose, false);
     connect(&m_timer, &QTimer::timeout, this, &MapIBPBeaconDialog::updateTime);
     m_timer.setInterval(1000);
+    m_timer.start();
     ui->beacons->setRowCount(IBPBeacon::m_frequencies.size());
     for (int row = 0; row < IBPBeacon::m_frequencies.size(); row++)
     {
@@ -44,6 +44,7 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
         ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
     }
     resizeTable();
+    updateTable(QTime::currentTime());
 }
 
 MapIBPBeaconDialog::~MapIBPBeaconDialog()
@@ -125,17 +126,3 @@ void MapIBPBeaconDialog::updateTime()
         updateTable(t);
     }
 }
-
-void MapIBPBeaconDialog::showEvent(QShowEvent *event)
-{
-    (void) event;
-    updateTable(QTime::currentTime());
-    updateTime();
-    m_timer.start();
-}
-
-void MapIBPBeaconDialog::hideEvent(QHideEvent *event)
-{
-    (void) event;
-    m_timer.stop();
-}

plugins/feature/map/mapibpbeacondialog.h

@@ -43,8 +43,6 @@ private slots:
     void accept();
     void on_beacons_cellDoubleClicked(int row, int column);
     void updateTime();
-    void showEvent(QShowEvent *event);
-    void hideEvent(QHideEvent *event);
 
 private:
     MapGUI *m_gui;

plugins/feature/map/mapradiotimedialog.cpp

@@ -29,7 +29,6 @@ MapRadioTimeDialog::MapRadioTimeDialog(MapGUI *gui, QWidget* parent) :
     ui(new Ui::MapRadioTimeDialog)
 {
     ui->setupUi(this);
-    setAttribute(Qt::WA_QuitOnClose, false);
     // Don't call updateTable until m_gui->getAzEl() will return valid location
 }
 

sdrbase/CMakeLists.txt

@@ -606,6 +606,8 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
     find_library(VULKAN_SPIRV_TOOLS_LIB SPIRV-Tools HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_OPT_LIB SPIRV-Tools-opt HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_SHARED_LIB SPIRV-Tools-shared HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
+    find_library(VULKAN_HLSL_LIB HLSL HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
+    find_library(VULKAN_OGLCOMPILER_LIB OGLCompiler HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_OSDEPENDENT_LIB OSDependent HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_LIB glslang HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_RES_LIB glslang-default-resource-limits HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@@ -622,6 +624,8 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
     find_library(VULKAN_SPIRV_TOOLSD_LIB SPIRV-Tools${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_OPTD_LIB SPIRV-Tools-opt${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_SHAREDD_LIB SPIRV-Tools-shared${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
+    find_library(VULKAN_HLSLD_LIB HLSL${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
+    find_library(VULKAN_OGLCOMPILERD_LIB OGLCompiler${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_OSDEPENDENTD_LIB OSDependent${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANGD_LIB glslang${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_RESD_LIB glslang-default-resource-limits${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@@ -634,6 +638,8 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
         optimized ${VULKAN_SPIRV_TOOLS_LIB}
         optimized ${VULKAN_SPIRV_TOOLS_OPT_LIB}
         optimized ${VULKAN_SPIRV_TOOLS_SHARED_LIB}
+        optimized ${VULKAN_HLSL_LIB}
+        optimized ${VULKAN_OGLCOMPILER_LIB}
         optimized ${VULKAN_OSDEPENDENT_LIB}
         optimized ${VULKAN_GLSLANG_LIB}
         optimized ${VULKAN_GLSLANG_RES_LIB}
@@ -645,6 +651,8 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
         debug ${VULKAN_SPIRV_TOOLSD_LIB}
         debug ${VULKAN_SPIRV_TOOLS_OPTD_LIB}
         debug ${VULKAN_SPIRV_TOOLS_SHAREDD_LIB}
+        debug ${VULKAN_HLSLD_LIB}
+        debug ${VULKAN_OGLCOMPILERD_LIB}
         debug ${VULKAN_OSDEPENDENTD_LIB}
         debug ${VULKAN_GLSLANGD_LIB}
         debug ${VULKAN_GLSLANG_RESD_LIB}

sdrbase/dsp/vkfftengine.cpp

@@ -16,7 +16,6 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QDebug>
-#include <QElapsedTimer>
 
 #include "dsp/vkfftengine.h"
 

sdrbase/dsp/vulkanvkfftengine.cpp

@@ -20,7 +20,6 @@
 #include "glslang_c_interface.h"
 
 #include "dsp/vulkanvkfftengine.h"
-#include "util/profiler.h"
 
 class GLSInitialiser {
 public: