From f4a50f4e1e1471b50fa9eb666396a738ac91b285 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Fri, 21 Apr 2023 13:44:46 -0500
Subject: [PATCH] Updating scripts and build files to reference Qt 6.5, and
 update OpenSSL to 3.1.0

---
 .github/workflows/ci.yml | 4 ++--
 conanfile.txt            | 2 +-
 setup-debug.bat          | 2 +-
 setup-debug.sh           | 2 +-
 setup-release.bat        | 2 +-
 setup-release.sh         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5794c2f..2fdbc65f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
             msvc_arch: x64
             msvc_toolset: 14.34
             msvc_version: 2022
-            qt_version: 6.4.2
+            qt_version: 6.5.0
             qt_arch: win64_msvc2019_64
             qt_tools: ''
             conan_arch: x86_64
@@ -43,7 +43,7 @@ jobs:
             env_cc: gcc-11
             env_cxx: g++-11
             compiler: gcc
-            qt_version: 6.4.2
+            qt_version: 6.5.0
             qt_arch: gcc_64
             qt_tools: ''
             conan_arch: x86_64
diff --git a/conanfile.txt b/conanfile.txt
index 4228790c..bd241403 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -8,7 +8,7 @@ glm/cci.20220420
 gtest/cci.20210126
 libcurl/7.86.0
 libxml2/2.10.3
-openssl/1.1.1t
+openssl/3.1.0
 spdlog/1.11.0
 sqlite3/3.40.1
 vulkan-loader/1.3.236.0
diff --git a/setup-debug.bat b/setup-debug.bat
index 2ed9af1a..dcc3f2ba 100644
--- a/setup-debug.bat
+++ b/setup-debug.bat
@@ -1,5 +1,5 @@
 call tools\setup-common.bat
 mkdir build-debug
 cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
 pause
diff --git a/setup-debug.sh b/setup-debug.sh
index 1f6552c8..bf55697e 100755
--- a/setup-debug.sh
+++ b/setup-debug.sh
@@ -2,4 +2,4 @@
 ./tools/setup-common.sh
 mkdir -p build-debug
 cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..
diff --git a/setup-release.bat b/setup-release.bat
index eca4e02a..da10db7c 100644
--- a/setup-release.bat
+++ b/setup-release.bat
@@ -1,5 +1,5 @@
 call tools\setup-common.bat
 mkdir build-release
 cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
 pause
diff --git a/setup-release.sh b/setup-release.sh
index 6d8dedae..04c7c2d9 100755
--- a/setup-release.sh
+++ b/setup-release.sh
@@ -2,4 +2,4 @@
 ./tools/setup-common.sh
 mkdir -p build-release
 cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 ..
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..