From e797bbead54aca992596ea1e2d283ada2f7e0de3 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Tue, 12 Nov 2024 17:14:33 +0100
Subject: [PATCH] Going for Qt version 6.8

---
 .github/workflows/appimage.yml | 11 +----------
 .gitignore                     |  1 +
 CMakeLists.txt                 |  4 +++-
 third_party/libwebsockets      |  2 +-
 third_party/maddy              |  2 +-
 third_party/mongoose           |  2 +-
 third_party/nlohmann           |  2 +-
 third_party/spdlog             |  2 +-
 vscp                           |  2 +-
 9 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index f82bd077..ac3c6c0f 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -30,12 +30,6 @@ jobs:
         ref: development
         submodules: recursive
 
-    # - name: Checkout eclipse paho repo
-    #   uses: actions/checkout@v4
-    #   with:
-    #     repository: eclipse/paho.mqtt.c
-    #     path: paho
-
     - name: Update before installing packages
       run: sudo apt-get update
 
@@ -48,9 +42,6 @@ jobs:
     - name: Install libssl-dev manually
       run: sudo apt-get install libssl-dev
 
-    # - name: Install paho manually
-    #   run: cd paho && mkdir build && cd build && sudo cmake -DPAHO_WITH_SSL=true .. && sudo make install
-    
     - name: Install curl manually
       run: sudo apt-get install libcurl4-openssl-dev
 
@@ -71,7 +62,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 5.15.*
+        version: 6.8.*
         host: 'linux'
         target: 'desktop'
         arch: 'linux_amd64_gcc'
diff --git a/.gitignore b/.gitignore
index 56652d0d..fc2a61df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ cmake_install.cmake
 vscp-works-qt.sln
 vscp-works-qt.vcxproj
 vscp-works-qt.vcxproj.filters
+DistributionKit/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a114cd4..d16c6ebb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,13 +64,15 @@ endif()
 file(TO_CMAKE_PATH "$ENV{VSCP_ROOT}" VSCP_PATH)
 message(STATUS "VSCP path = $ENV{VSCP_ROOT}")
 
+if (DEFINED QT_PATH)
 file(TO_CMAKE_PATH "$ENV{QT_ROOT_DIR}" QT_PATH)
 message(STATUS "QT_ROOT_DIR = $ENV{QT_ROOT_DIR}")
+endif()
 
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   add_definitions(-DWIN32_LEAN_AND_MEANS)
-  add_definitions(-D_POSIX_C_SOURCE)    
+  add_definitions(-D_POSIX_C_SOURCE)
   add_definitions(-DVCPKG_TARGET_TRIPLET=x64-windows)
   add_definitions(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
   add_definitions(-D_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS)
diff --git a/third_party/libwebsockets b/third_party/libwebsockets
index c57c2393..6328231f 160000
--- a/third_party/libwebsockets
+++ b/third_party/libwebsockets
@@ -1 +1 @@
-Subproject commit c57c239368deb998420e663160a1ab2ffd5d7934
+Subproject commit 6328231f2aa628632344d96a58e25c3b194af506
diff --git a/third_party/maddy b/third_party/maddy
index 1fe37d5a..1f12bc15 160000
--- a/third_party/maddy
+++ b/third_party/maddy
@@ -1 +1 @@
-Subproject commit 1fe37d5a1f6f41d3b5513d90e9c8eef7de76a241
+Subproject commit 1f12bc15b6b1c66e7fadf54367780488b9ffcf31
diff --git a/third_party/mongoose b/third_party/mongoose
index 98782e44..85414cfe 160000
--- a/third_party/mongoose
+++ b/third_party/mongoose
@@ -1 +1 @@
-Subproject commit 98782e44c2c095f18b839b09a231328824c23d46
+Subproject commit 85414cfec2219e4e4fe9cf93685f11ad4cdecd50
diff --git a/third_party/nlohmann b/third_party/nlohmann
index 0457de21..4a602df3 160000
--- a/third_party/nlohmann
+++ b/third_party/nlohmann
@@ -1 +1 @@
-Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7
+Subproject commit 4a602df34e71afca2242b34c743d4cc2486cd071
diff --git a/third_party/spdlog b/third_party/spdlog
index ae525b75..51a0deca 160000
--- a/third_party/spdlog
+++ b/third_party/spdlog
@@ -1 +1 @@
-Subproject commit ae525b75c31adaad130dd4501d37ff632ec5eade
+Subproject commit 51a0deca2c825f1d4461655a18bb37d6df76646d
diff --git a/vscp b/vscp
index 408bd5c0..24d846ef 160000
--- a/vscp
+++ b/vscp
@@ -1 +1 @@
-Subproject commit 408bd5c03531a034c1d0c70f57984e4629d99bd7
+Subproject commit 24d846ef38276697c325f637640beefbae23f379