From 40b86b63fbb990b26cc083ced32cb55f11ad263c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 27 Jan 2021 17:06:09 +0000
Subject: [PATCH] Update code for new SSL libraries in new Qt version

---
 qrenderdoc/Windows/Dialogs/CrashDialog.cpp | 17 +++++++++++++++++
 qrenderdoc/qrenderdoc_local.vcxproj        | 20 ++++++++++++++++++++
 util/installer/Installer32.wxs             |  4 ++--
 util/installer/Installer64.wxs             |  4 ++--
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/CrashDialog.cpp b/qrenderdoc/Windows/Dialogs/CrashDialog.cpp
index f8f3afbd5..f89503c82 100644
--- a/qrenderdoc/Windows/Dialogs/CrashDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/CrashDialog.cpp
@@ -184,10 +184,27 @@ CrashDialog::CrashDialog(PersistantConfig &cfg, QVariantMap crashReportJSON, QWi
            "libraries needed for SSL support. "
            "If you are building locally, check that ");
 
+#if(QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+
+#if defined(Q_OS_WIN32)
+#if QT_POINTER_SIZE == 8
+    text +=
+        tr("you have libcrypto-1_1-64.dll and libssl-1_1-64.dll available next to qrenderdoc.exe.");
+#else
+    text += tr("you have libcrypto-1_1.dll and libssl-1_1.dll available next to qrenderdoc.exe.");
+#endif
+#else
+    text += tr("you have the runtime libopenssl library >= 1.1.1 available in your system.");
+#endif
+
+#else
+
 #if defined(Q_OS_WIN32)
     text += tr("you have libeay32.dll and ssleay32.dll available next to qrenderdoc.exe.");
 #else
     text += tr("you have the runtime libopenssl library >= 1.0.0 available in your system.");
+#endif
+
 #endif
 
     text += lit("</p>");
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index ee918988d..e904cfbd8 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -1796,6 +1796,26 @@ IF %ERRORLEVEL% NEQ 0 (echo ====================================================
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
     </Content>
+    <Content Include="$(QtBinDir)\libcrypto-1_1.dll" Condition="Exists('$(QtBinDir)\libcrypto-1_1.dll') AND '$(Platform)'=='Win32'">
+      <Link>libcrypto-1_1.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="$(QtBinDir)\libssl-1_1.dll" Condition="Exists('$(QtBinDir)\libssl-1_1.dll') AND '$(Platform)'=='Win32'">
+      <Link>libssl-1_1.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="$(QtBinDir)\libcrypto-1_1-x64.dll" Condition="Exists('$(QtBinDir)\libcrypto-1_1-x64.dll') AND '$(Platform)'=='x64'">
+      <Link>libcrypto-1_1-x64.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="$(QtBinDir)\libssl-1_1-x64.dll" Condition="Exists('$(QtBinDir)\libssl-1_1-x64.dll') AND '$(Platform)'=='x64'">
+      <Link>libssl-1_1-x64.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
     <Content Include="$(QtBinDir)\libeay32.dll" Condition="Exists('$(QtBinDir)\libeay32.dll')">
       <Link>libeay32.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/util/installer/Installer32.wxs b/util/installer/Installer32.wxs
index d45d07a52..8b154987e 100644
--- a/util/installer/Installer32.wxs
+++ b/util/installer/Installer32.wxs
@@ -124,8 +124,8 @@
             <File Id='Qt5Network' Name='Qt5Network.dll' DiskId='1' Source='dist/Release32/Qt5Network.dll' />
             <File Id='Qt5Svg' Name='Qt5Svg.dll' DiskId='1' Source='dist/Release32/Qt5Svg.dll' />
             <File Id='Qt5Widgets' Name='Qt5Widgets.dll' DiskId='1' Source='dist/Release32/Qt5Widgets.dll' />
-            <File Id='libeay32' Name='libeay32.dll' DiskId='1' Source='dist/Release32/libeay32.dll' />
-            <File Id='ssleay32' Name='ssleay32.dll' DiskId='1' Source='dist/Release32/ssleay32.dll' />
+            <File Id='libcrypto' Name='libcrypto-1_1.dll' DiskId='1' Source='dist/Release32/libcrypto-1_1.dll' />
+            <File Id='libssl' Name='libssl-1_1.dll' DiskId='1' Source='dist/Release32/libssl-1_1.dll' />
           </Component>
 
           <Component Id='Python' Guid='63C5667D-38DA-464B-8E2F-B2857B8EAEC8'>
diff --git a/util/installer/Installer64.wxs b/util/installer/Installer64.wxs
index 233c7e516..e5c8c3f52 100644
--- a/util/installer/Installer64.wxs
+++ b/util/installer/Installer64.wxs
@@ -113,8 +113,8 @@
             <File Id='Qt5Network' Name='Qt5Network.dll' DiskId='1' Source='dist/Release64/Qt5Network.dll' />
             <File Id='Qt5Svg' Name='Qt5Svg.dll' DiskId='1' Source='dist/Release64/Qt5Svg.dll' />
             <File Id='Qt5Widgets' Name='Qt5Widgets.dll' DiskId='1' Source='dist/Release64/Qt5Widgets.dll' />
-            <File Id='libeay32' Name='libeay32.dll' DiskId='1' Source='dist/Release64/libeay32.dll' />
-            <File Id='ssleay32' Name='ssleay32.dll' DiskId='1' Source='dist/Release64/ssleay32.dll' />
+            <File Id='libcrypto' Name='libcrypto-1_1-x64.dll' DiskId='1' Source='dist/Release64/libcrypto-1_1-x64.dll' />
+            <File Id='libssl' Name='libssl-1_1-x64.dll' DiskId='1' Source='dist/Release64/libssl-1_1-x64.dll' />
           </Component>
 
           <Component Id='Python' Win64="yes" Guid='CE2C9D5B-9040-47C7-8E42-B79B52AE93EB'>