Enable websockets support in QField

opengisch · Sep 15, 2024 · 9619e92 · 9619e92
1 parent 82b75f7
commit 9619e92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,7 +117,7 @@ if (ANDROID)
  set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_BINARY_DIR}/android-template)
 endif()
 
-find_package(Qt6 COMPONENTS Concurrent Core Qml Gui Xml Positioning Widgets Network Quick Svg Sql Sensors WebView Multimedia Bluetooth Nfc REQUIRED)
+find_package(Qt6 COMPONENTS Concurrent Core Qml Gui Xml Positioning Widgets Network Quick Svg Sql Sensors WebView Multimedia Bluetooth Nfc WebSockets REQUIRED)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
  find_package(Qt6 COMPONENTS PrintSupport REQUIRED)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -348,6 +348,7 @@ target_link_libraries(
  Qt::Concurrent
  Qt::WebView
  Qt::Multimedia
+ Qt::WebSockets
  QGIS::Core
  QGIS::Analysis
  ZXing::ZXing

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -22,6 +22,7 @@ import QtQuick.Window
 import QtQml
 import QtSensors
 import QtCore
+import QtWebSockets // Not used here but added so QML registers its dependencies for plugins to use
 import org.qgis
 import org.qfield
 import Theme

diff --git a/vcpkg.json b/vcpkg.json
@@ -91,6 +91,12 @@
  "host": true,
  "default-features": false
  },
+ {
+ "name": "qtwebsockets",
+ "features": [
+ "qml"
+ ]
+ },
  "qtwebview",
  {
  "name": "sentry-cocoa",