Use Qt 5.12.2 for official Windows releases (Mudlet#2511)

* Us Qt 5.12.2 for official Windows releases * Update appveyor.set-environment.ps1 * Remove -lglut dependency See https://forum.qt.io/topic/102016/lglut-not-found-after-upgrading-from-qt-5-11-to-5-12-on-windows/2 * Limit max number of printed errors to 5 * Set the MINGW_BASE_DIR to the 32bit version * Revert "Limit max number of printed errors to 5" This reverts commit d9012bb.
CriusMacOldenly · May 9, 2019 · 51b82f4 · 51b82f4
1 parent d0f3f69
commit 51b82f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,7 +13,8 @@ environment:
   DBLSQD_PASS:
     secure: Bm5PLJjC39XmRC55RPGVP9c5CFxvWu2VorAAmu5QS38=
   matrix:
-  - QT_BASE_DIR: C:\Qt\5.11\mingw53_32
+  - QT_BASE_DIR: C:\Qt\5.12.2\mingw73_32
+    MINGW_BASE_DIR: C:\Qt\Tools\mingw730_32
 install:
 - cd "%APPVEYOR_BUILD_FOLDER%\CI"
 - powershell ".\appveyor.install.ps1"

diff --git a/CI/appveyor.set-environment.ps1 b/CI/appveyor.set-environment.ps1
@@ -6,7 +6,7 @@ function SetQtBaseDir([string] $logFile) {
     }
     catch
     {
-      $Env:QT_BASE_DIR = "C:\Qt\5.11.0\mingw53_32"
+      $Env:QT_BASE_DIR = "C:\Qt\5.12.2\mingw73_32"
     }
   }
   Write-Output "Using $Env:QT_BASE_DIR as QT base directory." | Tee-Object -File "$logFile" -Append
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ function SetQtBaseDir([string] $logFile) { @@
         }
         catch
         {
-          $Env:QT_BASE_DIR = "C:\Qt\5.11.0\mingw53_32"
+          $Env:QT_BASE_DIR = "C:\Qt\5.12.2\mingw73_32"
         }
       }
       Write-Output "Using $Env:QT_BASE_DIR as QT base directory." | Tee-Object -File "$logFile" -Append
@@ Expand Down @@