Add Qt WebEngine dependency

.appveyor.yml

@@ -80,7 +80,7 @@ for:
           sudo apt-get -y install build-essential cmake git xxd \
             devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libqt5opengl5-dev \
             qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
-            libqt5quick5 \
+            libqt5quick5 qtwebengine5-dev \
             qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
             qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
             libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \

CMakeLists.txt

@@ -336,7 +336,10 @@ if (BUILD_GUI)
                     Quick
                     QuickWidgets
                     Location
-                    TextToSpeech)
+                    TextToSpeech
+                    WebEngine
+                    WebEngineCore
+                    WebEngineWidgets)
 endif()
 
 # other requirements
@@ -597,6 +600,11 @@ if(WIN32)
   windeployqt(${CMAKE_PROJECT_NAME} ${SDRANGEL_BINARY_BIN_DIR} ${PROJECT_SOURCE_DIR}/sdrgui/resources)
 endif()
 
+# Install debug symbols
+if (WIN32)
+  install(FILES $<TARGET_PDB_FILE:${CMAKE_PROJECT_NAME}> CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_BIN_DIR} )
+endif()
+
 # install documentation
 # TODO maybe install readme for every plugins
 install(FILES ${CMAKE_SOURCE_DIR}/Readme.md DESTINATION ${INSTALL_DOC_DIR})

cmake/cpack/CMakeLists.txt

@@ -247,7 +247,9 @@ elseif(WIN32 OR MINGW)
   if(BUILD_GUI)
     install(CODE "
       include(BundleUtilities)
-      fixup_bundle(\"${SDRANGEL_BINARY_BIN_DIR}/sdrangel${CMAKE_EXECUTABLE_SUFFIX}\" \"\" \"${WINDOWS_FIXUP_BUNDLE_LIB_DIRS}\")
+      # BundleUtilities.cmake verify_app fails unless we ignore QtWebEngineProcess.exe, as it fails if there are any "external" prerequisites
+      # Should we ignore it? It appears to work OK if we do. Is there a better way?
+      fixup_bundle(\"${SDRANGEL_BINARY_BIN_DIR}/sdrangel${CMAKE_EXECUTABLE_SUFFIX}\" \"\" \"${WINDOWS_FIXUP_BUNDLE_LIB_DIRS}\" IGNORE_ITEM \"QtWebEngineProcess.exe\")
     " COMPONENT Runtime)
   elseif(BUILD_SERVER)
     install(CODE "
@@ -295,6 +297,7 @@ elseif(WIN32 OR MINGW)
     install(DIRECTORY "${OPENSSL_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
       FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
 
+
     install(CODE "
       # remove *.lib files
       # TODO find a better way

debian/control

@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 9),
  qtdeclarative5-dev,
  qtpositioning5-dev,
  qtlocation5-dev,
+ qtwebengine5-dev,
  libusb-1.0-0-dev,
  libboost-all-dev,
  libasound2-dev,

plugins/channelrx/CMakeLists.txt

@@ -26,7 +26,7 @@ if(DAB_FOUND AND ZLIB_FOUND AND FAAD_FOUND)
     add_subdirectory(demoddab)
 endif()
 
-if(APT_FOUND)
+if(APT_FOUND AND SGP4_FOUND)
     add_subdirectory(demodapt)
 endif()
 

plugins/feature/CMakeLists.txt

@@ -4,7 +4,7 @@ if (Qt5SerialPort_FOUND)
     add_subdirectory(gs232controller)
 endif()
 
-if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND AND Qt5Location_FOUND)
+if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND AND Qt5Location_FOUND AND Qt5WebEngine_FOUND)
     add_subdirectory(map)
 endif()
 if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND)