Merge branch 'master' into releases/1.2

.appveyor.yml

@@ -65,7 +65,6 @@ environment:
       OPENSSL_DIR: OpenSSL-Win64
       LIBSSL: libssl-1_1-x64.dll
       LIBCRYPTO: libcrypto-1_1-x64.dll
-      QT_LOCK_REPO: 'mingw/x86_64/mingw-w64-x86_64'
 
       CHOCO_ARCH:
       PROGRAM_FILES: "Program Files"
@@ -81,7 +80,6 @@ environment:
       OPENSSL_DIR: OpenSSL-Win32
       LIBSSL: libssl-1_1.dll
       LIBCRYPTO: libcrypto-1_1.dll
-      QT_LOCK_REPO: 'mingw/mingw32/mingw-w64-i686'
 
       CHOCO_ARCH:  --x86
       PROGRAM_FILES: "Program Files (x86)"
@@ -159,10 +157,17 @@ for:
       wait
       echo "=== Build cache usage is " $( du -h $cdir | tail -1 ) "==="
 
-
     test_script: |-
 
-      TMPDIR=/tmp src/tests/tests --appveyor
+      TMPDIR=/tmp src/tests/tests --appveyor --output-file=testOutput.log
+
+      res=$?;
+      if [ "$res" != "0" ]; then
+          # The tests failed. Upload all output to ease debugging.
+          appveyor PushArtifact testOutput.log
+      fi
+
+      ( exit $res )
 
   - 
     cache: /Users/appveyor/cache_dir
@@ -265,9 +270,16 @@ for:
 
     test_script: |-
       cd build
-      TMPDIR=/tmp src/tests/tests --appveyor
+
+      TMPDIR=/tmp src/tests/tests --appveyor --output-file=testOutput.log
+
       res=$?
       wait
+
+      if [ "$res" != "0" ]; then
+          # The tests failed. Upload all output to ease debugging.
+          appveyor PushArtifact testOutput.log
+      fi
       echo "=== Build cache usage is " $( du -h $cdir | tail -1 ) "==="
       ( exit $res )
 
@@ -289,7 +301,7 @@ for:
 
           cmake --version
           g++ --version
-          choco install %CHOCO_ARCH% jack --version 1.9.17 -my
+          choco install %CHOCO_ARCH% -y jack
 
           REM *** Results are ignored since a dependency was not properly installed in 32 bit Windows. But the .dll files required are installed regardless, so we don't care.***
 
@@ -302,10 +314,10 @@ for:
           c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-portaudio
           c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-portmidi
           c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-libwinpthread-git
-          c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-qt5
+          REM *** As of 2022-20-09 the package database refresh (-y) is required to get the newest qt package and to avoid a critical bug in less recent ones. In addition, the refresh _must_ take place _after_ installing libwinpthread (which otherwise fails). ***
+          c:\msys64\usr\bin\pacman --noconfirm -S -q -y %MSYS_REPO%-qt5
           c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-ladspa-sdk
           c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-ccache
-          c:\msys64\usr\bin\pacman --noconfirm -U https://repo.msys2.org/%QT_LOCK_REPO%-qt5-tools-5.15.2-2-any.pkg.tar.zst
 
           ccache -M 256M
           ccache -s
@@ -334,7 +346,12 @@ for:
           SET CORE_PATH=%cd%\src\core
           echo %CORE_PATH%
           set PATH=%CORE_PATH%;%PATH%
-          src\tests\tests.exe --appveyor || cmd /c "exit /b 1"
+          src\tests\tests.exe --appveyor --output-file=testOutput.log
+
+          REM *** In case the test passed, we delete its output. If it fails, the
+          REM     script won't reach this point and the output will be uploaded later on ***
+          IF %ERRORLEVEL% EQU 0 (del testOutput.log)
+
           7z a %APPVEYOR_BUILD_FOLDER%\testresults.zip %TEMP%\hydrogen || cmd /c "exit  /b 1"
           if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH% appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\testresults.zip
 
@@ -370,9 +387,11 @@ on_finish:
   - cmd: if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH%  appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\CMakeCache.txt
   - cmd: if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH%  appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\CMakeFiles\CMakeOutput.log
   - cmd: if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH%  appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\CMakeFiles\CMakeError.log
+
+  - cmd: if EXIST %APPVEYOR_BUILD_FOLDER%\build\testOutput.log appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\testOutput.log
+
   - cmd: if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH% if not %job_name%==Windows32  appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\Hydrogen-1.2-win64.exe || cmd /c "exit /b 1"
   - cmd: if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH% if %job_name%==Windows32  appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\build\Hydrogen-1.2-win32.exe || cmd /c "exit /b 1"
 
-
   - cmd: |
       if %APPVEYOR_REPO_BRANCH%==%ARTIFACT_BRANCH% curl -F file=@%APPVEYOR_BUILD_FOLDER%\build\test_installation.xml https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%

.gitignore

@@ -1,5 +1,7 @@
 *.kdev4
 *~
+\#*\#
+.\#*
 *.o
 *.cbp
 *.layout