Updating 32-bit Qt install on our Win build VM to Qt 5.12.8

no2101 · Apr 11, 2020 · 0da8973 · 0da8973
1 parent 2fc7bf6
commit 0da8973
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(WIN32 AND MSVC)
 	else()
 		# Paths for 32-bit windows builds
 		set(OPENSSL_PATH "C:/dev/OpenSSL-Win32" CACHE PATH "OpenSSL Path")
-		set(QT5_PATH "C:/dev/Qt/5.7/msvc2015" CACHE PATH "Qt5 Path")
+		set(QT5_PATH "C:/dev/Qt/5.12.8/5.12.8/msvc2017" CACHE PATH "Qt5 Path")
 
                 # Choose between SQLCipher or SQLite, depending whether
                 # -Dsqlcipher=1 is passed on the command line

diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi
@@ -62,7 +62,7 @@
         <?define SQLiteExePath="C:\builds\release-sqlite-win64\Release" ?>
         <?define SQLCipherExePath="C:\builds\release-sqlcipher-win64\Release" ?>
     <?elseif $(sys.BUILDARCH)="x86"?>
-        <?define QtPath="C:\dev\Qt\5.7\msvc2015" ?>
+        <?define QtPath="C:\dev\Qt\5.12.8\5.12.8\msvc2017" ?>
         <?define SQLitePath="C:\dev\SQLite-Win32" ?>
         <?define SQLCipherPath="C:\git_repos\SQLCipher-Win32" ?>
         <?define OpenSSLPath="C:\dev\OpenSSL-Win32" ?>