Going for Qt version 6.8

grodansparadis · Nov 12, 2024 · e797bbe · e797bbe
1 parent 44141ee
commit e797bbe
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/third_party/maddy b/third_party/maddy
diff --git a/third_party/mongoose b/third_party/mongoose
diff --git a/third_party/nlohmann b/third_party/nlohmann
diff --git a/third_party/spdlog b/third_party/spdlog
diff --git a/vscp b/vscp
+11 −0		.github/dependabot.yml
+1 −1		.github/workflows/create-release-package.yml
+4 −7		.github/workflows/run-tests.yml
+1 −1		CHANGELOG.md
+1 −1		tests/CMakeLists.txt
+1 −1		.github/CONTRIBUTING.md
+5 −1		CMakeLists.txt
+2 −2		README.md
+1 −1		docs/examples/at__keytype_const.c++17.cpp
+1 −1		docs/mkdocs/docs/api/basic_json/is_structured.md
+1 −1		docs/mkdocs/docs/api/basic_json/operator_gt.md
+1 −1		docs/mkdocs/docs/api/basic_json/operator_le.md
+1 −1		docs/mkdocs/docs/api/basic_json/operator_lt.md
+1 −1		docs/mkdocs/docs/api/basic_json/update.md
+118 −0		docs/mkdocs/docs/api/macros/nlohmann_define_derived_type.md
+1 −1		docs/mkdocs/docs/features/arbitrary_types.md
+3 −3		docs/mkdocs/docs/features/json_pointer.md
+1 −1		include/nlohmann/detail/input/lexer.hpp
+26 −0		include/nlohmann/detail/macro_scope.hpp
+129 −129		nlohmann_json.natvis
+28 −43		single_include/nlohmann/json.hpp
+0 −1		single_include/nlohmann/json_fwd.hpp
+1 −1		tests/src/unit-class_parser.cpp
+1 −1		tests/src/unit-regression2.cpp
+185 −0		tests/src/unit-udt_macro.cpp
+3 −3		tools/gdb_pretty_printer/nlohmann-json.py
+13 −13		tools/generate_natvis/nlohmann_json.natvis.j2
+0 −1		.clang-tidy
+26 −18		.github/workflows/linux.yml
+28 −0		.github/workflows/macos.yml
+148 −0		.github/workflows/windows.yml
+3 −0		.gitignore
+32 −8		CMakeLists.txt
+13 −10		INSTALL
+26 −3		README.md
+1 −1		bench/async_bench.cpp
+2 −2		bench/bench.cpp
+1 −1		bench/latency.cpp
+13 −2		cmake/utils.cmake
+24 −2		example/example.cpp
+2 −2		include/spdlog/common.h
+1 −1		include/spdlog/details/file_helper-inl.h
+3 −3		include/spdlog/details/mpmc_blocking_q.h
+14 −5		include/spdlog/details/os-inl.h
+0 −20		include/spdlog/details/registry-inl.h
+5 −11		include/spdlog/details/registry.h
+61 −67		include/spdlog/fmt/bundled/args.h
+3,077 −0		include/spdlog/fmt/bundled/base.h
+863 −500		include/spdlog/fmt/bundled/chrono.h
+122 −161		include/spdlog/fmt/bundled/color.h
+78 −160		include/spdlog/fmt/bundled/compile.h
+4 −3,322		include/spdlog/fmt/bundled/core.h
+424 −219		include/spdlog/fmt/bundled/format-inl.h
+1,615 −1,405		include/spdlog/fmt/bundled/format.h
+142 −181		include/spdlog/fmt/bundled/os.h
+77 −103		include/spdlog/fmt/bundled/ostream.h
+259 −243		include/spdlog/fmt/bundled/printf.h
+446 −286		include/spdlog/fmt/bundled/ranges.h
+598 −70		include/spdlog/fmt/bundled/std.h
+166 −73		include/spdlog/fmt/bundled/xchar.h
+0 −4		include/spdlog/fmt/fmt.h
+50 −0		include/spdlog/mdc.h
+71 −1		include/spdlog/pattern_formatter-inl.h
+1 −1		include/spdlog/sinks/ansicolor_sink.h
+4 −4		include/spdlog/sinks/base_sink.h
+1 −1		include/spdlog/sinks/callback_sink.h
+2 −0		include/spdlog/sinks/daily_file_sink.h
+2 −0		include/spdlog/sinks/hourly_file_sink.h
+1 −1		include/spdlog/sinks/msvc_sink.h
+1 −1		include/spdlog/sinks/rotating_file_sink-inl.h
+3 −2		include/spdlog/sinks/syslog_sink.h
+9 −0		include/spdlog/sinks/wincolor_sink-inl.h
+0 −10		include/spdlog/spdlog-inl.h
+0 −8		include/spdlog/spdlog.h
+1 −1		include/spdlog/version.h
+16 −17		src/bundled_fmtlib_format.cpp
+4 −2		tests/CMakeLists.txt
+6 −0		tests/includes.h
+61 −0		tests/test_create_dir.cpp
+20 −2		tests/test_misc.cpp
+130 −0		tests/test_pattern_formatter.cpp