Build fixes 17

.github/workflows/windows.yml

@@ -154,17 +154,12 @@ jobs:
           Expand-Archive -Path C:/_/build/nsis/Nsislog.zip -DestinationPath C:/_/build/nsis/Nsislog
           Tree /f C:/_/build
 
-      # Somehow, running the configure script sets up CMake to use Ninja rather than Makefiles, which is then in
-      # conflict with our other assumptions about CMake.  Error message says remove CMakeCache.txt before running CMake,
-      # so we do that as a short-term fix (on the assumption that, longer term, we'll be moving to Meson).
+      # The configure script does default set-up for CMake that is enough for us here
       - name: CMake Config
         shell: msys2 {0}
         run: |
           cd /C/_
           ./configure
-#          cd build
-#          rm CMakeCache.txt
-#          cmake .. -DCMAKE_RC_COMPILER:FILEPATH=windres.exe -G "MinGW Makefiles"
 
       - name: Build (with Meson)
         shell: msys2 {0}

scripts/buildTool.py

@@ -1923,11 +1923,14 @@ def doPackage():
          # folder tree "containing the Qt-related dependencies (libraries, QML imports, plugins, and translations)
          # required to run the application from that folder".
          #
+         # In the MSYS2 packaging of Qt6 at least, per https://packages.msys2.org/packages/mingw-w64-x86_64-qt6-base,
+         # windeployqt is renamed to windeployqt6.
+         #
          log.debug('Running windeployqt')
          previousWorkingDirectory = pathlib.Path.cwd().as_posix()
          os.chdir(dir_packages_win_bin)
          btUtils.abortOnRunFail(
-            subprocess.run(['windeployqt',
+            subprocess.run(['windeployqt6',
                             '--verbose', '2',        # 2 is the maximum
                             projectName + '.exe'],
                            capture_output=False)