From 4bffb568fb04f1ba98f9a7bcb034b60d4375b84c Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 19 Mar 2024 07:56:40 +1000
Subject: [PATCH 01/15] Updating next version to be v5.2.1.

---
 lib/include/cc_tools_qt/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/include/cc_tools_qt/version.h b/lib/include/cc_tools_qt/version.h
index d77b88f..75cab71 100644
--- a/lib/include/cc_tools_qt/version.h
+++ b/lib/include/cc_tools_qt/version.h
@@ -28,7 +28,7 @@
 #define CC_TOOLS_QT_MINOR_VERSION 2U
 
 /// @brief Patch level of the library
-#define CC_TOOLS_QT_PATCH_VERSION 0U
+#define CC_TOOLS_QT_PATCH_VERSION 1U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_TOOLS_QT_MAKE_VERSION(major_, minor_, patch_) \

From 309c767c9e7c5858a658f78e6632a17cdf21d91a Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 16:42:03 +1000
Subject: [PATCH 02/15] Trying Qt download in the github actions.

---
 .github/workflows/actions_build.yml | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 854e68d..8bd4609 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -4,10 +4,12 @@ on: [push]
 
 env:
   COMMS_BRANCH: v5.2.2
+  QT5_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/5.15.3/qt-5.15.3-dynamic-msvc2019-x86_64.7z
 
 jobs:
 
   build_gcc_ubuntu_22_04:
+    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -18,7 +20,7 @@ jobs:
         qt_ver: [5, 6]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -61,6 +63,7 @@ jobs:
         VERBOSE: 1         
       
   build_clang_ubuntu_22_04:
+    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -80,7 +83,7 @@ jobs:
             cpp: 20      
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -122,3 +125,25 @@ jobs:
       env:
         VERBOSE: 1 
     
+  build_msvc_2019:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        arch: [x64]
+        cpp: [17]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build   
+
+    - name: Install Qt
+      shell: cmd
+      run: |
+        choco install curl
+        curl -L ${{env.QT5_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
+        7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
+

From d4698ca6d448f216e17fcdb0df9a923fc9a49df7 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 16:48:25 +1000
Subject: [PATCH 03/15] Attempt to build with msvc2019 on github actions.

---
 .github/workflows/actions_build.yml | 27 +++++++++++++++++++++++++++
 script/prepare_externals.bat        |  4 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 8bd4609..6ee6b9d 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -133,6 +133,7 @@ jobs:
         type: [Debug, Release, MinSizeRel]
         arch: [x64]
         cpp: [17]
+        qt_ver: [5]
 
     steps:
     - uses: actions/checkout@v4
@@ -147,3 +148,29 @@ jobs:
         curl -L ${{env.QT5_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
         7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
 
+    - name: Prepare externals
+      shell: cmd
+      run: %GITHUB_WORKSPACE%\script\prepare_externals.sh
+      env:
+        BUILD_DIR: ${{runner.workspace}}/build
+        PLATFORM: ${{matrix.arch}}
+        EXTERNALS_DIR: ${{runner.workspace}}/externals
+        COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
+        COMMON_BUILD_TYPE: ${{matrix.type}}
+        COMMON_CXX_STANDARD: ${{matrix.cpp}}
+        COMMS_TAG: ${{env.COMMS_BRANCH}}
+
+    - name: Configure CMake
+      shell: cmd
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
+          -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: cmd
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1 
diff --git a/script/prepare_externals.bat b/script/prepare_externals.bat
index 9648a93..c819af4 100755
--- a/script/prepare_externals.bat
+++ b/script/prepare_externals.bat
@@ -14,7 +14,7 @@ rem -----------------------------------------------------
 
 if [%BUILD_DIR%] == [] echo "BUILD_DIR hasn't been specified" & exit /b 1
 
-if [%GENERATOR%] == [] set GENERATOR="NMake Makefiles"
+if NOT [%GENERATOR%] == [] set GENERATOR_PARAM=-G %GENERATOR%
 
 if NOT [%PLATFORM%] == [] set PLATFORM_PARAM=-A %PLATFORM%
 
@@ -51,7 +51,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 echo "Building COMMS library..."
 mkdir "%COMMS_BUILD_DIR%"
 cd %COMMS_BUILD_DIR%
-cmake -G %GENERATOR% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% ^
+cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% ^
     -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% -DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD%
 if %errorlevel% neq 0 exit /b %errorlevel%
 cmake --build %COMMS_BUILD_DIR% --config %COMMON_BUILD_TYPE% --target install

From f229ccc3e3208a292cbe3541230df8dd8947b637 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 16:49:25 +1000
Subject: [PATCH 04/15] Attempt to fix github actions configuration.

---
 .github/workflows/actions_build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 6ee6b9d..3a48dee 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -150,7 +150,8 @@ jobs:
 
     - name: Prepare externals
       shell: cmd
-      run: %GITHUB_WORKSPACE%\script\prepare_externals.sh
+      run: |
+        %GITHUB_WORKSPACE%\script\prepare_externals.sh
       env:
         BUILD_DIR: ${{runner.workspace}}/build
         PLATFORM: ${{matrix.arch}}

From 8d275ff9fa866e5abae343dd930a8bdc0f24e238 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 16:52:19 +1000
Subject: [PATCH 05/15] Another attempt to fix windows build configuration on
 github actions.

---
 .github/workflows/actions_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 3a48dee..b68f3b7 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -151,7 +151,7 @@ jobs:
     - name: Prepare externals
       shell: cmd
       run: |
-        %GITHUB_WORKSPACE%\script\prepare_externals.sh
+        %GITHUB_WORKSPACE%\script\prepare_externals.bat
       env:
         BUILD_DIR: ${{runner.workspace}}/build
         PLATFORM: ${{matrix.arch}}

From 5196b0ef57c0930b96bbad4fbac5de724a9046b4 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 16:54:13 +1000
Subject: [PATCH 06/15] More fixes to the github actions configuration.

---
 .github/workflows/actions_build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index b68f3b7..db80188 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -165,8 +165,8 @@ jobs:
       shell: cmd
       working-directory: ${{runner.workspace}}/build
       run: |
-        cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
+        cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
           -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
 
     - name: Build Target 

From b89ca584733d8ff188fb318dde775864d6e11c67 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 17:03:42 +1000
Subject: [PATCH 07/15] Attempt to fix msvc2019 build on github actions.

---
 .github/workflows/actions_build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index db80188..e98933c 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -4,7 +4,6 @@ on: [push]
 
 env:
   COMMS_BRANCH: v5.2.2
-  QT5_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/5.15.3/qt-5.15.3-dynamic-msvc2019-x86_64.7z
 
 jobs:
 
@@ -147,6 +146,8 @@ jobs:
         choco install curl
         curl -L ${{env.QT5_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
         7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
+      env:
+        QT5_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/5.15.3/qt-5.15.3-dynamic-msvc2019-x86_64.7z
 
     - name: Prepare externals
       shell: cmd
@@ -166,7 +167,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/qt-5.15.3-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
           -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
 
     - name: Build Target 

From 2b4e9bb528fe66341bc4d650f461863bc401ada6 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 17:09:11 +1000
Subject: [PATCH 08/15] Re-enable ubuntu builds in github actions.

---
 .github/workflows/actions_build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index e98933c..ed3a8b2 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -8,7 +8,6 @@ env:
 jobs:
 
   build_gcc_ubuntu_22_04:
-    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -62,7 +61,6 @@ jobs:
         VERBOSE: 1         
       
   build_clang_ubuntu_22_04:
-    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false

From 86bd076d2fdd0313f9ef9115ea46210e3539dc5e Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 17:10:18 +1000
Subject: [PATCH 09/15] Requiring v5.2.3 of the comms library.

---
 .appveyor.yml                       | 2 +-
 .github/workflows/actions_build.yml | 2 +-
 lib/include/cc_tools_qt/version.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index bffd774..ed75685 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,7 +18,7 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: v5.2.2
+    COMMS_BRANCH: develop
     matrix:
         - CPP_STD: 17
           QT_MAJOR: 5
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index ed3a8b2..0dfa231 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -3,7 +3,7 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: v5.2.2
+  COMMS_BRANCH: develop
 
 jobs:
 
diff --git a/lib/include/cc_tools_qt/version.h b/lib/include/cc_tools_qt/version.h
index 75cab71..b149b4b 100644
--- a/lib/include/cc_tools_qt/version.h
+++ b/lib/include/cc_tools_qt/version.h
@@ -77,7 +77,7 @@ constexpr unsigned version()
     return CC_TOOLS_QT_VERSION;
 }
 
-static_assert(COMMS_MAKE_VERSION(5, 2, 2) <= comms::version(),
+static_assert(COMMS_MAKE_VERSION(5, 2, 3) <= comms::version(),
     "The version of COMMS library is too old");
 
 } // namespace cc_tools_qt

From bdd317627bc35678b7a82e5d240d216958f3f04b Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Sun, 7 Apr 2024 17:19:15 +1000
Subject: [PATCH 10/15] Supporting "tcp.local_port" and "network.local_port"
 inter-plugin configuration values in "CC TCP/IP Server Socket".

---
 plugin/tcp_socket/server/TcpServerSocket.cpp    | 14 ++++++++++++++
 plugin/tcp_socket/server/tcp_server_socket.json |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugin/tcp_socket/server/TcpServerSocket.cpp b/plugin/tcp_socket/server/TcpServerSocket.cpp
index 68f1f87..5644aee 100644
--- a/plugin/tcp_socket/server/TcpServerSocket.cpp
+++ b/plugin/tcp_socket/server/TcpServerSocket.cpp
@@ -50,12 +50,24 @@ const QString& tcpPortProp()
     return Str;
 }
 
+const QString& tcpLocalPortProp()
+{
+    static const QString Str("tcp.local_port");
+    return Str;
+}
+
 const QString& networkPortProp()
 {
     static const QString Str("network.port");
     return Str;
 }
 
+const QString& networkLocalPortProp()
+{
+    static const QString Str("network.local_port");
+    return Str;
+}
+
 }  // namespace
 
 TcpServerSocket::TcpServerSocket()
@@ -140,7 +152,9 @@ void TcpServerSocket::applyInterPluginConfigImpl(const QVariantMap& props)
     bool updated = false;
 
     static const QString* PortProps[] = {
+        &networkLocalPortProp(),
         &networkPortProp(),
+        &tcpLocalPortProp(),
         &tcpPortProp(),
     };    
 
diff --git a/plugin/tcp_socket/server/tcp_server_socket.json b/plugin/tcp_socket/server/tcp_server_socket.json
index 7ae9d2d..6750d53 100644
--- a/plugin/tcp_socket/server/tcp_server_socket.json
+++ b/plugin/tcp_socket/server/tcp_server_socket.json
@@ -5,7 +5,9 @@
         "communication via TCP/IP connection.\n\n",
         "Accepts inter-plugin configuration values:\n",
         "    { \"tcp.port\": 1234} - Override the port configuration.\n",
-        "    { \"network.port\": 1234} - Alias to \"tcp.port\".\n"               
+        "    { \"tcp.local_port\": 1234} - Alias to \"tcp.port\".\n",
+        "    { \"network.port\": 1234} - Alias to \"tcp.port\".\n",
+        "    { \"network.local_port\": 1234} - Alias to \"tcp.port\".\n"               
     ],
     "type" : "socket"
 }
\ No newline at end of file

From 92a58daaea8ebe7681f1575672996094e0a5c777 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 9 Apr 2024 08:17:40 +1000
Subject: [PATCH 11/15] Using v5.2.3 of comms in appveyor and github actions.

---
 .appveyor.yml                       | 4 ++--
 .github/workflows/actions_build.yml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ed75685..7979b7f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,7 +18,7 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: develop
+    COMMS_TAG: v5.2.3
     matrix:
         - CPP_STD: 17
           QT_MAJOR: 5
@@ -44,7 +44,7 @@ install:
     - set PATH=%PATH%;%QTDIR%\bin
     - set BUILD_DIR=%APPVEYOR_BUILD_FOLDER%\build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
     - if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
-    - set COMMS_TAG=%COMMS_BRANCH%
+    - set COMMS_TAG=%COMMS_TAG%
     - set COMMON_INSTALL_DIR=%BUILD_DIR%\install
     - set COMMON_BUILD_TYPE=%CONFIGURATION%
     - set COMMON_CXX_STANDARD=%CPP_STD%
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 0dfa231..c170639 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -3,7 +3,7 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: develop
+  COMMS_TAG: v5.2.3
 
 jobs:
 
@@ -40,7 +40,7 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -102,7 +102,7 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -158,7 +158,7 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
 
     - name: Configure CMake
       shell: cmd

From 665a88ed1c23faac5ea17409d88093a25f51728c Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 9 Apr 2024 08:29:31 +1000
Subject: [PATCH 12/15] Testing build with Qt6 on windows runner in github
 actions.

---
 .github/workflows/actions_build.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index c170639..167023e 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -8,6 +8,7 @@ env:
 jobs:
 
   build_gcc_ubuntu_22_04:
+    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -61,6 +62,7 @@ jobs:
         VERBOSE: 1         
       
   build_clang_ubuntu_22_04:
+    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -130,7 +132,7 @@ jobs:
         type: [Debug, Release, MinSizeRel]
         arch: [x64]
         cpp: [17]
-        qt_ver: [5]
+        qt_ver: [5, 6]
 
     steps:
     - uses: actions/checkout@v4
@@ -138,14 +140,20 @@ jobs:
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build   
 
-    - name: Install Qt
+    - name: Install Curl
       shell: cmd
       run: |
         choco install curl
-        curl -L ${{env.QT5_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
+
+    - name: Install Qt
+      shell: cmd
+      run: |
+        curl -L ${{env.QT_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
         7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
       env:
         QT5_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/5.15.3/qt-5.15.3-dynamic-msvc2019-x86_64.7z
+        QT6_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/6.2.2/qt-6.2.2-dynamic-msvc2019-x86_64.7z
+        QT_MSVC2019_URL: ${{matrix.qt_ver == '5' && env.QT5_MSVC2019_URL || env.QT6_MSVC2019_URL}}
 
     - name: Prepare externals
       shell: cmd
@@ -165,8 +173,12 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/qt-5.15.3-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/${{env.QT_NAME}}" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
           -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
+      env:
+        QT5_NAME: qt-5.15.3-dynamic-msvc2019-x86_64
+        QT6_NAME: qt-6.2.2-dynamic-msvc2019-x86_64
+        QT_NAME: ${{matrix.qt_ver == '5' && env.QT5_NAME || env.QT6_NAME}}
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build

From feca28589d930ba962338448081a47871c3d2209 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 9 Apr 2024 08:46:04 +1000
Subject: [PATCH 13/15] Attempt to fix github action windows runner
 configuration.

---
 .github/workflows/actions_build.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 167023e..fa9b8a7 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -148,12 +148,10 @@ jobs:
     - name: Install Qt
       shell: cmd
       run: |
-        curl -L ${{env.QT_MSVC2019_URL}} -o ${{runner.workspace}}/qt.7z
+        curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
         7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
       env:
-        QT5_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/5.15.3/qt-5.15.3-dynamic-msvc2019-x86_64.7z
-        QT6_MSVC2019_URL: https://github.com/martinrotter/qt-minimalistic-builds/releases/download/6.2.2/qt-6.2.2-dynamic-msvc2019-x86_64.7z
-        QT_MSVC2019_URL: ${{matrix.qt_ver == '5' && env.QT5_MSVC2019_URL || env.QT6_MSVC2019_URL}}
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
 
     - name: Prepare externals
       shell: cmd
@@ -173,12 +171,10 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/${{env.QT_NAME}}" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
           -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
       env:
-        QT5_NAME: qt-5.15.3-dynamic-msvc2019-x86_64
-        QT6_NAME: qt-6.2.2-dynamic-msvc2019-x86_64
-        QT_NAME: ${{matrix.qt_ver == '5' && env.QT5_NAME || env.QT6_NAME}}
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build

From 46db89a59a3805d7294811e496e059cf3b94cdc6 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 9 Apr 2024 08:49:08 +1000
Subject: [PATCH 14/15] Another attempt to fix github actions configuration.

---
 .github/workflows/actions_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index fa9b8a7..7327486 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -171,7 +171,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
           -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
       env:
         QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}

From 50776cea77bd489c761cb1cb1891b65aa75b7841 Mon Sep 17 00:00:00 2001
From: Alex Robenko <arobenko@gmail.com>
Date: Tue, 9 Apr 2024 08:54:33 +1000
Subject: [PATCH 15/15] Restoring ubuntu builds on github actions.

---
 .github/workflows/actions_build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
index 7327486..b629c67 100644
--- a/.github/workflows/actions_build.yml
+++ b/.github/workflows/actions_build.yml
@@ -8,7 +8,6 @@ env:
 jobs:
 
   build_gcc_ubuntu_22_04:
-    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -62,7 +61,6 @@ jobs:
         VERBOSE: 1         
       
   build_clang_ubuntu_22_04:
-    if: false
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false