New Windows Qt5/Qt6 CI test

.github/workflows/windows-build-qt6.yml

@@ -1,347 +0,0 @@
-name: Windows Build Qt6 (test)
-
-on:
-  workflow_dispatch:       # Manual trigger only, until the Qt6 build is validated
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-windows-qt6:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v7
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Install MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          cache: true
-          install: >-
-            git
-            mingw-w64-ucrt-x86_64-ccache
-            mingw-w64-ucrt-x86_64-gcc
-            mingw-w64-ucrt-x86_64-cmake
-            mingw-w64-ucrt-x86_64-ninja
-            mingw-w64-ucrt-x86_64-qt6-base
-            mingw-w64-ucrt-x86_64-qt6-svg
-            mingw-w64-ucrt-x86_64-qt6-tools
-            mingw-w64-ucrt-x86_64-qt6-translations
-            mingw-w64-ucrt-x86_64-qt6-pdf
-            mingw-w64-ucrt-x86_64-sqlite3
-            mingw-w64-ucrt-x86_64-pkg-config
-            mingw-w64-ucrt-x86_64-nsis
-            mingw-w64-ucrt-x86_64-angleproject
-
-      - name: Cache ccache
-        uses: actions/cache@v5
-        with:
-          path: C:\Users\runneradmin\AppData\Local\ccache
-          key: ccache-windows-qt6-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            ccache-windows-qt6-${{ github.ref_name }}-
-            ccache-windows-qt6-
-
-      - name: Configure ccache
-        shell: msys2 {0}
-        run: |
-          /ucrt64/bin/ccache --set-config=max_size=500M
-          /ucrt64/bin/ccache --set-config=compression=true
-          /ucrt64/bin/ccache -z
-          echo "=== ccache config ==="
-          /ucrt64/bin/ccache -p
-
-      - name: Patch NSIS Welcome page — fix title font size
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          WELCOME_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Welcome.nsh" | head -1)
-          if [ -z "$WELCOME_NSH" ]; then
-            echo "WARNING: Welcome.nsh not found, skipping font patch"
-          else
-            echo "Patching: $WELCOME_NSH"
-            sed -i '/WelcomePage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$WELCOME_NSH"
-            grep 'WelcomePage.Title.Font' "$WELCOME_NSH"
-            echo "  OK font size patched to 10"
-          fi
-
-          FINISH_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Finish.nsh" | head -1)
-          if [ -z "$FINISH_NSH" ]; then
-            echo "WARNING: Finish.nsh not found, skipping font patch"
-          else
-            echo "Patching: $FINISH_NSH"
-            sed -i '/FinishPage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$FINISH_NSH"
-            grep 'FinishPage.Title.Font' "$FINISH_NSH"
-            echo "  OK font size patched to 10"
-          fi
-
-      - name: Build with cmake
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          cd "$GITHUB_WORKSPACE"
-          mkdir build && cd build
-          NPROC=$(nproc)
-          echo "Available CPUs: $NPROC"
-
-          cmake -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_PREFIX_PATH=/ucrt64 \
-            -DQt6_DIR=/ucrt64/lib/cmake/Qt6 \
-            -DQT_VERSION_MAJOR=6 \
-            -DBUILD_WITH_KF5=OFF \
-            -DPACKAGE_TESTS=OFF \
-            -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-            -DCMAKE_CXX_FLAGS="-DQET_EXPORT_PROJECT_DB" \
-            -DCMAKE_C_COMPILER_LAUNCHER=/ucrt64/bin/ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=/ucrt64/bin/ccache \
-            -DSQLite3_INCLUDE_DIR=/ucrt64/include \
-            -DSQLite3_LIBRARY=/ucrt64/lib/libsqlite3.dll.a \
-            ..
-          ninja -j"$NPROC"
-
-      - name: Show ccache stats
-        shell: msys2 {0}
-        run: |
-          echo "=== ccache statistics ==="
-          /ucrt64/bin/ccache -s
-
-      - name: Verify exe was built
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
-          if [ -z "$EXE" ]; then
-            echo "ERROR: no qelectrotech.exe found in build/"
-            find "$GITHUB_WORKSPACE/build" -maxdepth 3 -name "*.exe" || true
-            exit 1
-          fi
-          SIZE=$(stat -c%s "$EXE")
-          echo "Exe found: $EXE ($SIZE bytes)"
-          [ "$SIZE" -gt 100000 ] || { echo "ERROR: exe too small"; exit 1; }
-
-      - name: Deploy — copy exe + windeployqt + DLLs
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root"
-          FILES="$NSIS_ROOT/files"
-          BIN="$FILES/bin"
-          mkdir -p "$BIN"
-
-          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
-          echo "Copying exe: $EXE -> $BIN/QElectroTech.exe"
-          cp "$EXE" "$BIN/QElectroTech.exe"
-
-          cd "$BIN"
-          /ucrt64/bin/windeployqt6 \
-            --release \
-            --no-translations \
-            --no-compiler-runtime \
-            ./QElectroTech.exe || true
-
-          echo "=== 3-pass transitive DLL scan ==="
-          set +e
-          for PASS in 1 2 3; do
-            echo "-- Pass $PASS --"
-            for bin_file in "$BIN"/*.dll "$BIN"/*.exe "$BIN"/sqldrivers/*.dll "$BIN"/platforms/*.dll "$BIN"/imageformats/*.dll; do
-              [ -f "$bin_file" ] || continue
-              while IFS= read -r line; do
-                dll_path=$(echo "$line" | awk '{print $3}')
-                [ -f "$dll_path" ] || continue
-                dll_name=$(basename "$dll_path")
-                dst="$BIN/$dll_name"
-                if [ ! -f "$dst" ]; then
-                  cp "$dll_path" "$dst"
-                  echo "  Copied (pass $PASS): $dll_name"
-                fi
-              done < <(ldd "$bin_file" 2>/dev/null | grep -i '/ucrt64/bin/')
-            done
-          done
-          set -e
-
-          DLL_COUNT=$(find "$BIN" -name "*.dll" | wc -l)
-          echo "=== $DLL_COUNT DLLs present after scan ==="
-          ls -lh "$BIN/QElectroTech.exe" || { echo "ERROR: exe missing from bin/"; exit 1; }
-          [ "$DLL_COUNT" -gt 5 ] || { echo "ERROR: too few DLLs"; exit 1; }
-          cd "$GITHUB_WORKSPACE"
-
-          cp /ucrt64/bin/libgcc_s_seh-1.dll  "$BIN/"
-          cp /ucrt64/bin/libstdc++-6.dll      "$BIN/"
-          cp /ucrt64/bin/libwinpthread-1.dll  "$BIN/"
-          SQLITE=$(find /ucrt64/bin -name "libsqlite3*.dll" | head -1)
-          if [ -n "$SQLITE" ]; then
-            cp "$SQLITE" "$BIN/"
-            echo "SQLite3 copied: $(basename $SQLITE)"
-          else
-            echo "WARNING: libsqlite3 not found in /ucrt64/bin/"
-          fi
-
-          cp "$GITHUB_WORKSPACE/build-aux/windows/QET64.nsi"              "$NSIS_ROOT/"
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra.nsh"         "$NSIS_ROOT/"
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_fr.nsh"      "$NSIS_ROOT/"
-          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_missing.nsh" "$NSIS_ROOT/"
-          cp -r "$GITHUB_WORKSPACE/build-aux/windows/nsis_base/." "$NSIS_ROOT/"
-
-          curl -fsSL \
-            "https://raw.githubusercontent.com/qelectrotech/qelectrotech-source-mirror/refs/heads/master/misc/Lancer%20QET.bat" \
-            -o "$FILES/Lancer QET.bat"
-          cp -r "$GITHUB_WORKSPACE/elements"    "$FILES/elements"    || true
-          cp -r "$GITHUB_WORKSPACE/titleblocks" "$FILES/titleblocks" || true
-          cp -r "$GITHUB_WORKSPACE/examples"    "$FILES/examples"    || true
-          cp -r "$GITHUB_WORKSPACE/fonts"       "$FILES/fonts"       || true
-
-          cp -r "$GITHUB_WORKSPACE/lang"        "$FILES/lang"        || true
-          find "$GITHUB_WORKSPACE/build" -name "*.qm" -exec cp {} "$FILES/lang/" \; 2>/dev/null || true
-          echo "=== .qm files in files/lang/ ==="
-          ls "$FILES/lang/"*.qm 2>/dev/null | wc -l || echo "0 .qm files"
-
-          for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE; do
-            cp "$GITHUB_WORKSPACE/$f" "$FILES/$f" 2>/dev/null || true
-          done
-
-          echo "=== Verification of key files in files/ ==="
-          for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE \
-                   qet_uninstall_file_associations.reg register_filetypes.bat "Lancer QET.bat"; do
-            [ -f "$FILES/$f" ] \
-              && echo "  OK      : $f" \
-              || echo "  MISSING: $f"
-          done
-          for d in ico elements lang titleblocks fonts examples bin; do
-            [ -d "$FILES/$d" ] \
-              && echo "  OK      : $d/" \
-              || echo "  MISSING: $d/"
-          done
-
-      - name: Extract version for installer name
-        shell: msys2 {0}
-        id: qet_version
-        run: |
-          set -euo pipefail
-
-          GITCOMMIT=$(git -C "$GITHUB_WORKSPACE" rev-parse --short HEAD)
-
-          A=$(git -C "$GITHUB_WORKSPACE" rev-list HEAD --count)
-          HEAD=$(( A + 473 ))
-
-          # qetversion.cpp now contains 2 "return QVersionNumber{" lines (Qt5/Qt6
-          # in an #if/#else block): target the Qt6 branch explicitly, otherwise
-          # "grep | head -1" would only ever read the first one in the file.
-          VERSION=$(awk '/QT_VERSION_CHECK\(6, 0, 0\)/{f=1;next} f && /return QVersionNumber/{print;exit}' \
-              "$GITHUB_WORKSPACE/sources/qetversion.cpp" \
-            | awk -F '{' '{ print $2 }' \
-            | awk -F '}' '{ print $1 }' \
-            | sed -e 's/,/./g' -e 's/ //g')
-          [ -z "$VERSION" ] && VERSION="dev"
-
-          FULL_VERSION="${VERSION}-qt6-r${HEAD}-${GITCOMMIT}_x86_64-win64"
-          BASE_VERSION="${VERSION}-qt6"
-          echo "version=$FULL_VERSION"      >> "$GITHUB_OUTPUT"
-          echo "base_version=$BASE_VERSION" >> "$GITHUB_OUTPUT"
-          echo "gitcommit=$GITCOMMIT"       >> "$GITHUB_OUTPUT"
-          echo "head=$HEAD"                 >> "$GITHUB_OUTPUT"
-          echo "VERSION    : $VERSION"
-          echo "GITCOMMIT  : $GITCOMMIT"
-          echo "HEAD (rev) : $HEAD"
-          echo "FULL       : $FULL_VERSION"
-
-      - name: Patch QET64.nsi — version + exe name + absolute paths
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          VERSION="${{ steps.qet_version.outputs.version }}"
-          NSI="$GITHUB_WORKSPACE/nsis_root/QET64.nsi"
-          FILES_WIN=$(cygpath -w "$GITHUB_WORKSPACE/nsis_root/files")
-          SCRIPT="$GITHUB_WORKSPACE/build-aux/windows/patch_nsi.py"
-
-          python3 "$SCRIPT" "$NSI" "$VERSION" "$FILES_WIN"
-
-          echo "=== Verification ==="
-          grep 'SOFT_VERSION' "$NSI" | head -1
-          grep -m2 'nsis_root' "$NSI" | head -2
-          echo "=== Contents of nsis_root/files/ ==="
-          ls "$GITHUB_WORKSPACE/nsis_root/files/"
-
-      - name: Build NSIS installer
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root"
-          cd "$NSIS_ROOT"
-          echo "=== CWD : $(pwd) ==="
-          MSYS2_ARG_CONV_EXCL="*" makensis /V4 QET64.nsi
-          RC=$?
-          echo "=== Contents of nsis_root after makensis ==="
-          ls "$NSIS_ROOT/"
-          [ $RC -eq 0 ] || { echo "ERROR: makensis failed (exit $RC)"; exit 1; }
-
-      - name: Move installer to dist/
-        shell: msys2 {0}
-        run: |
-          set -euo pipefail
-          mkdir -p "$GITHUB_WORKSPACE/dist"
-          INSTALLER=$(find "$GITHUB_WORKSPACE/nsis_root" -maxdepth 1 -iname "installer_*.exe" | head -1)
-          if [ -z "$INSTALLER" ]; then
-            echo "ERROR: no installer .exe found in nsis_root/"
-            ls "$GITHUB_WORKSPACE/nsis_root/"
-            exit 1
-          fi
-          echo "Moving: $INSTALLER -> dist/"
-          mv "$INSTALLER" "$GITHUB_WORKSPACE/dist/"
-
-      - name: Upload build logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: build-logs-qt6
-          path: |
-            build/CMakeFiles/*.log
-            nsis_root/files/bin/
-          if-no-files-found: warn
-
-      - name: Zip portable (readytouse)
-        id: zip_portable
-        shell: pwsh
-        run: |
-          $version = "${{ steps.qet_version.outputs.base_version }}"
-          $head    = "${{ steps.qet_version.outputs.head }}"
-          $zipName = "qelectrotech-${version}+git${head}-x86-win64-readytouse.zip"
-          $src     = "$env:GITHUB_WORKSPACE\nsis_root\files"
-          $dst     = "$env:GITHUB_WORKSPACE\dist\$zipName"
-          $7z      = "C:\Program Files\7-Zip\7z.exe"
-
-          New-Item -ItemType Directory -Force -Path "$env:GITHUB_WORKSPACE\dist" | Out-Null
-          & $7z a -tzip -mx=5 -mmt=on $dst "$src\*"
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-          $sizeMB = [math]::Round((Get-Item $dst).Length / 1MB, 1)
-          Write-Output "ZIP created: $zipName ($sizeMB MB)"
-          "zip_name=$zipName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
-
-      - name: Upload portable (files/ without installer)
-        uses: actions/upload-artifact@v7
-        with:
-          name: qelectrotech-${{ steps.qet_version.outputs.base_version }}+git${{ steps.qet_version.outputs.head }}-x86-win64-readytouse
-          path: dist/${{ steps.zip_portable.outputs.zip_name }}
-          retention-days: 14
-
-      - name: Upload NSIS installer
-        uses: actions/upload-artifact@v7
-        with:
-          name: qelectrotech-windows-installer-qt6
-          path: dist/Installer_*.exe
-          retention-days: 14
-
-      - name: Upload portable (qt6-scoped name, for a future MSI workflow)
-        uses: actions/upload-artifact@v7
-        with:
-          name: qelectrotech-windows-portable-qt6
-          path: nsis_root/files/
-          retention-days: 14

.github/workflows/windows-build.yml

@@ -10,6 +10,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # =============================================================================
+  # Job 1: Qt5 build (stable track)
+  # =============================================================================
   build-windows:
     runs-on: windows-latest
     steps:
@@ -356,33 +359,370 @@ jobs:
           path: nsis_root/files/
           retention-days: 14
 
+  # =============================================================================
+  # Job 2: Qt6 build (EXPERIMENTAL track)
+  #
+  # Version label: the C++ source (sources/qetversion.cpp) intentionally stays
+  # Qt-agnostic — QT_VERSION-based detection inside the binary proved unreliable
+  # (see commit e1aa65f, reverting 608ca984). Here the CI job itself knows with
+  # certainty which Qt major version it configured (-DQT_VERSION_MAJOR=6), so it
+  # is safe to label the *package* "0.200.1" at this level, without touching
+  # QetVersion::currentVersion() or making the binary self-detect its Qt build.
+  # =============================================================================
+  build-windows-qt6:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Install MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          cache: true
+          install: >-
+            git
+            mingw-w64-ucrt-x86_64-ccache
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-ninja
+            mingw-w64-ucrt-x86_64-qt6-base
+            mingw-w64-ucrt-x86_64-qt6-svg
+            mingw-w64-ucrt-x86_64-qt6-tools
+            mingw-w64-ucrt-x86_64-qt6-translations
+            mingw-w64-ucrt-x86_64-qt6-pdf
+            mingw-w64-ucrt-x86_64-sqlite3
+            mingw-w64-ucrt-x86_64-pkg-config
+            mingw-w64-ucrt-x86_64-nsis
+            mingw-w64-ucrt-x86_64-angleproject
+
+      - name: Cache ccache
+        uses: actions/cache@v5
+        with:
+          path: C:\Users\runneradmin\AppData\Local\ccache
+          key: ccache-windows-qt6-${{ github.ref_name }}-${{ github.sha }}
+          restore-keys: |
+            ccache-windows-qt6-${{ github.ref_name }}-
+            ccache-windows-qt6-
+
+      - name: Configure ccache
+        shell: msys2 {0}
+        run: |
+          /ucrt64/bin/ccache --set-config=max_size=500M
+          /ucrt64/bin/ccache --set-config=compression=true
+          /ucrt64/bin/ccache -z
+          echo "=== ccache config ==="
+          /ucrt64/bin/ccache -p
+
+      - name: Patch NSIS Welcome page — fix title font size
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          WELCOME_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Welcome.nsh" | head -1)
+          if [ -z "$WELCOME_NSH" ]; then
+            echo "WARNING: Welcome.nsh not found, skipping font patch"
+          else
+            echo "Patching: $WELCOME_NSH"
+            sed -i '/WelcomePage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$WELCOME_NSH"
+            grep 'WelcomePage.Title.Font' "$WELCOME_NSH"
+            echo "  OK font size patched to 10"
+          fi
+
+          FINISH_NSH=$(find /ucrt64 -path "*/Modern UI 2/Pages/Finish.nsh" | head -1)
+          if [ -z "$FINISH_NSH" ]; then
+            echo "WARNING: Finish.nsh not found, skipping font patch"
+          else
+            echo "Patching: $FINISH_NSH"
+            sed -i '/FinishPage\.Title\.Font/s/"[0-9]\+" "700"/"10" "700"/' "$FINISH_NSH"
+            grep 'FinishPage.Title.Font' "$FINISH_NSH"
+            echo "  OK font size patched to 10"
+          fi
+
+      - name: Build with cmake
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          cd "$GITHUB_WORKSPACE"
+          mkdir build && cd build
+          NPROC=$(nproc)
+          echo "Available CPUs: $NPROC"
+
+          cmake -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_PREFIX_PATH=/ucrt64 \
+            -DQt6_DIR=/ucrt64/lib/cmake/Qt6 \
+            -DQT_VERSION_MAJOR=6 \
+            -DBUILD_WITH_KF5=OFF \
+            -DPACKAGE_TESTS=OFF \
+            -DCMAKE_POLICY_DEFAULT_CMP0077=NEW \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+            -DCMAKE_CXX_FLAGS="-DQET_EXPORT_PROJECT_DB" \
+            -DCMAKE_C_COMPILER_LAUNCHER=/ucrt64/bin/ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=/ucrt64/bin/ccache \
+            -DSQLite3_INCLUDE_DIR=/ucrt64/include \
+            -DSQLite3_LIBRARY=/ucrt64/lib/libsqlite3.dll.a \
+            ..
+          ninja -j"$NPROC"
+
+      - name: Show ccache stats
+        shell: msys2 {0}
+        run: |
+          echo "=== ccache statistics ==="
+          /ucrt64/bin/ccache -s
+
+      - name: Verify exe was built
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
+          if [ -z "$EXE" ]; then
+            echo "ERROR: no qelectrotech.exe found in build/"
+            find "$GITHUB_WORKSPACE/build" -maxdepth 3 -name "*.exe" || true
+            exit 1
+          fi
+          SIZE=$(stat -c%s "$EXE")
+          echo "Exe found: $EXE ($SIZE bytes)"
+          [ "$SIZE" -gt 100000 ] || { echo "ERROR: exe too small"; exit 1; }
+
+      - name: Deploy — copy exe + windeployqt + DLLs
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root"
+          FILES="$NSIS_ROOT/files"
+          BIN="$FILES/bin"
+          mkdir -p "$BIN"
+
+          EXE=$(find "$GITHUB_WORKSPACE/build" -maxdepth 3 -iname "qelectrotech.exe" | head -1)
+          echo "Copying exe: $EXE -> $BIN/QElectroTech.exe"
+          cp "$EXE" "$BIN/QElectroTech.exe"
+
+          cd "$BIN"
+          /ucrt64/bin/windeployqt6 \
+            --release \
+            --no-translations \
+            --no-compiler-runtime \
+            ./QElectroTech.exe || true
+
+          echo "=== 3-pass transitive DLL scan ==="
+          set +e
+          for PASS in 1 2 3; do
+            echo "-- Pass $PASS --"
+            for bin_file in "$BIN"/*.dll "$BIN"/*.exe "$BIN"/sqldrivers/*.dll "$BIN"/platforms/*.dll "$BIN"/imageformats/*.dll; do
+              [ -f "$bin_file" ] || continue
+              while IFS= read -r line; do
+                dll_path=$(echo "$line" | awk '{print $3}')
+                [ -f "$dll_path" ] || continue
+                dll_name=$(basename "$dll_path")
+                dst="$BIN/$dll_name"
+                if [ ! -f "$dst" ]; then
+                  cp "$dll_path" "$dst"
+                  echo "  Copied (pass $PASS): $dll_name"
+                fi
+              done < <(ldd "$bin_file" 2>/dev/null | grep -i '/ucrt64/bin/')
+            done
+          done
+          set -e
+
+          DLL_COUNT=$(find "$BIN" -name "*.dll" | wc -l)
+          echo "=== $DLL_COUNT DLLs present after scan ==="
+          ls -lh "$BIN/QElectroTech.exe" || { echo "ERROR: exe missing from bin/"; exit 1; }
+          [ "$DLL_COUNT" -gt 5 ] || { echo "ERROR: too few DLLs"; exit 1; }
+          cd "$GITHUB_WORKSPACE"
+
+          cp /ucrt64/bin/libgcc_s_seh-1.dll  "$BIN/"
+          cp /ucrt64/bin/libstdc++-6.dll      "$BIN/"
+          cp /ucrt64/bin/libwinpthread-1.dll  "$BIN/"
+          SQLITE=$(find /ucrt64/bin -name "libsqlite3*.dll" | head -1)
+          if [ -n "$SQLITE" ]; then
+            cp "$SQLITE" "$BIN/"
+            echo "SQLite3 copied: $(basename $SQLITE)"
+          else
+            echo "WARNING: libsqlite3 not found in /ucrt64/bin/"
+          fi
+
+          cp "$GITHUB_WORKSPACE/build-aux/windows/QET64.nsi"              "$NSIS_ROOT/"
+          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra.nsh"         "$NSIS_ROOT/"
+          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_fr.nsh"      "$NSIS_ROOT/"
+          cp "$GITHUB_WORKSPACE/build-aux/windows/lang_extra_missing.nsh" "$NSIS_ROOT/"
+          cp -r "$GITHUB_WORKSPACE/build-aux/windows/nsis_base/." "$NSIS_ROOT/"
+
+          curl -fsSL \
+            "https://raw.githubusercontent.com/qelectrotech/qelectrotech-source-mirror/refs/heads/master/misc/Lancer%20QET.bat" \
+            -o "$FILES/Lancer QET.bat"
+          cp -r "$GITHUB_WORKSPACE/elements"    "$FILES/elements"    || true
+          cp -r "$GITHUB_WORKSPACE/titleblocks" "$FILES/titleblocks" || true
+          cp -r "$GITHUB_WORKSPACE/examples"    "$FILES/examples"    || true
+          cp -r "$GITHUB_WORKSPACE/fonts"       "$FILES/fonts"       || true
+
+          cp -r "$GITHUB_WORKSPACE/lang"        "$FILES/lang"        || true
+          find "$GITHUB_WORKSPACE/build" -name "*.qm" -exec cp {} "$FILES/lang/" \; 2>/dev/null || true
+          echo "=== .qm files in files/lang/ ==="
+          ls "$FILES/lang/"*.qm 2>/dev/null | wc -l || echo "0 .qm files"
+
+          for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE; do
+            cp "$GITHUB_WORKSPACE/$f" "$FILES/$f" 2>/dev/null || true
+          done
+
+          echo "=== Verification of key files in files/ ==="
+          for f in LICENSE ChangeLog CREDIT README ELEMENTS.LICENSE \
+                   qet_uninstall_file_associations.reg register_filetypes.bat "Lancer QET.bat"; do
+            [ -f "$FILES/$f" ] \
+              && echo "  OK      : $f" \
+              || echo "  MISSING: $f"
+          done
+          for d in ico elements lang titleblocks fonts examples bin; do
+            [ -d "$FILES/$d" ] \
+              && echo "  OK      : $d/" \
+              || echo "  MISSING: $d/"
+          done
+
+      - name: Extract version for installer name (Qt6 — labelled 0.200.1)
+        shell: msys2 {0}
+        id: qet_version
+        run: |
+          set -euo pipefail
+
+          GITCOMMIT=$(git -C "$GITHUB_WORKSPACE" rev-parse --short HEAD)
+
+          A=$(git -C "$GITHUB_WORKSPACE" rev-list HEAD --count)
+          HEAD=$(( A + 473 ))
+
+          # Deliberately NOT parsed from sources/qetversion.cpp: the CI job
+          # already knows for certain it configured Qt6 (-DQT_VERSION_MAJOR=6),
+          # so the "0.200.1" experimental-track label is set here explicitly
+          # rather than relying on in-binary Qt version detection.
+          VERSION="0.200.1"
+
+          FULL_VERSION="${VERSION}-qt6-r${HEAD}-${GITCOMMIT}_x86_64-win64"
+          BASE_VERSION="${VERSION}-qt6"
+          echo "version=$FULL_VERSION"      >> "$GITHUB_OUTPUT"
+          echo "base_version=$BASE_VERSION" >> "$GITHUB_OUTPUT"
+          echo "gitcommit=$GITCOMMIT"       >> "$GITHUB_OUTPUT"
+          echo "head=$HEAD"                 >> "$GITHUB_OUTPUT"
+          echo "VERSION    : $VERSION"
+          echo "GITCOMMIT  : $GITCOMMIT"
+          echo "HEAD (rev) : $HEAD"
+          echo "FULL       : $FULL_VERSION"
+
+      - name: Patch QET64.nsi — version + exe name + absolute paths
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          VERSION="${{ steps.qet_version.outputs.version }}"
+          NSI="$GITHUB_WORKSPACE/nsis_root/QET64.nsi"
+          FILES_WIN=$(cygpath -w "$GITHUB_WORKSPACE/nsis_root/files")
+          SCRIPT="$GITHUB_WORKSPACE/build-aux/windows/patch_nsi.py"
+
+          python3 "$SCRIPT" "$NSI" "$VERSION" "$FILES_WIN"
+
+          echo "=== Verification ==="
+          grep 'SOFT_VERSION' "$NSI" | head -1
+          grep -m2 'nsis_root' "$NSI" | head -2
+          echo "=== Contents of nsis_root/files/ ==="
+          ls "$GITHUB_WORKSPACE/nsis_root/files/"
+
+      - name: Build NSIS installer
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          NSIS_ROOT="$GITHUB_WORKSPACE/nsis_root"
+          cd "$NSIS_ROOT"
+          echo "=== CWD : $(pwd) ==="
+          MSYS2_ARG_CONV_EXCL="*" makensis /V4 QET64.nsi
+          RC=$?
+          echo "=== Contents of nsis_root after makensis ==="
+          ls "$NSIS_ROOT/"
+          [ $RC -eq 0 ] || { echo "ERROR: makensis failed (exit $RC)"; exit 1; }
+
+      - name: Move installer to dist/
+        shell: msys2 {0}
+        run: |
+          set -euo pipefail
+          mkdir -p "$GITHUB_WORKSPACE/dist"
+          INSTALLER=$(find "$GITHUB_WORKSPACE/nsis_root" -maxdepth 1 -iname "installer_*.exe" | head -1)
+          if [ -z "$INSTALLER" ]; then
+            echo "ERROR: no installer .exe found in nsis_root/"
+            ls "$GITHUB_WORKSPACE/nsis_root/"
+            exit 1
+          fi
+          echo "Moving: $INSTALLER -> dist/"
+          mv "$INSTALLER" "$GITHUB_WORKSPACE/dist/"
+
+      - name: Upload build logs on failure
+        if: failure()
+        uses: actions/upload-artifact@v7
+        with:
+          name: build-logs-qt6
+          path: |
+            build/CMakeFiles/*.log
+            nsis_root/files/bin/
+          if-no-files-found: warn
+
+      - name: Zip portable (readytouse)
+        id: zip_portable
+        shell: pwsh
+        run: |
+          $version = "${{ steps.qet_version.outputs.base_version }}"
+          $head    = "${{ steps.qet_version.outputs.head }}"
+          $zipName = "qelectrotech-${version}+git${head}-x86-win64-readytouse.zip"
+          $src     = "$env:GITHUB_WORKSPACE\nsis_root\files"
+          $dst     = "$env:GITHUB_WORKSPACE\dist\$zipName"
+          $7z      = "C:\Program Files\7-Zip\7z.exe"
+
+          New-Item -ItemType Directory -Force -Path "$env:GITHUB_WORKSPACE\dist" | Out-Null
+          & $7z a -tzip -mx=5 -mmt=on $dst "$src\*"
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+          $sizeMB = [math]::Round((Get-Item $dst).Length / 1MB, 1)
+          Write-Output "ZIP created: $zipName ($sizeMB MB)"
+          "zip_name=$zipName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+
+      - name: Upload portable (files/ without installer)
+        uses: actions/upload-artifact@v7
+        with:
+          name: qelectrotech-${{ steps.qet_version.outputs.base_version }}+git${{ steps.qet_version.outputs.head }}-x86-win64-readytouse
+          path: dist/${{ steps.zip_portable.outputs.zip_name }}
+          retention-days: 14
+
+      - name: Upload NSIS installer
+        uses: actions/upload-artifact@v7
+        with:
+          name: qelectrotech-windows-installer-qt6
+          path: dist/Installer_*.exe
+          retention-days: 14
+
+      - name: Upload portable (nom fixe pour le workflow MSI)
+        uses: actions/upload-artifact@v7
+        with:
+          name: qelectrotech-windows-portable-qt6
+          path: nsis_root/files/
+          retention-days: 14
+
   # ---------------------------------------------------------------------------
-  # Job 2 : Publie une release nightly + page GitHub Pages
+  # Job 3 : Publie les assets nightly (exe + zip, Qt5 et Qt6) sur la release
   # Ne tourne que sur push master (pas sur les PRs)
   # ---------------------------------------------------------------------------
-  deploy-pages:
+  publish-nightly-assets:
-    needs: build-windows
+    needs: [build-windows, build-windows-qt6]
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     permissions:
       contents: write
 
     steps:
-      - name: Checkout master (for build-aux scripts)
+      - name: Download installer artifacts (Qt5 + Qt6)
-        uses: actions/checkout@v7
-        with:
-          ref: master
-          path: source
-          sparse-checkout: build-aux/generate-page.py
-          sparse-checkout-cone-mode: false
-
-      - name: Download installer artifact
         uses: actions/download-artifact@v8
         with:
-          name: qelectrotech-windows-installer
+          pattern: qelectrotech-windows-installer*
           path: downloaded/installer/
+          merge-multiple: true
 
-      - name: Download portable artifact
+      - name: Download portable artifacts (Qt5 + Qt6)
         uses: actions/download-artifact@v8
         with:
           pattern: qelectrotech-*-readytouse
@@ -394,7 +734,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}
         run: |
-          # Fetch existing .exe and .zip asset names and delete them
           gh release view nightly --repo "$REPO" --json assets \
             --jq '.assets[] | select(.name | test("\\.(exe|zip)$")) | .name' \
           | while read -r name; do
@@ -419,6 +758,9 @@ jobs:
 
             > ⚠️ This is a development version; it introduces new features you want, but may cause bugs that have not yet been identified yet.
             > For stable releases, see the [Releases page](https://github.com/${{ github.repository }}/releases).
+
+            > 🧪 **Qt6 builds are experimental.** Files tagged `-qt6-` are built against Qt6 and are not yet
+            > as tested as the Qt5 track. Expect rough edges; report issues clearly labelled "Qt6".
           prerelease: true
           make_latest: false
           files: |
@@ -427,4 +769,4 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       # GitHub Pages is generated and deployed by windows-msi.yml
-      # after the MSI upload, so that all 3 URLs (exe, zip, msi) are known.
+      # after the MSI upload, so that all URLs (exe/zip/msi, Qt5+Qt6) are known.

.github/workflows/windows-msi.yml

@@ -16,18 +16,37 @@ on:
 
 jobs:
   build-msi:
-    name: Build MSI with WiX v7
+    name: Build MSI with WiX v7 (${{ matrix.flavor }})
     runs-on: windows-latest
     # Only runs if Windows Build succeeded (or triggered manually)
     if: >
       github.event_name == 'workflow_dispatch' ||
       github.event.workflow_run.conclusion == 'success'
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - flavor: qt5
+            portable_artifact: qelectrotech-windows-portable
+            version_source: qetversion   # parsed from sources/qetversion.cpp
+            label_suffix: ""
+            experimental: false
+          - flavor: qt6
+            portable_artifact: qelectrotech-windows-portable-qt6
+            version_source: hardcoded    # see note in "Extract version" step
+            label_suffix: "-qt6-EXPERIMENTAL"
+            experimental: true
+
     permissions:
       contents: write
       pages: write
       id-token: write  # Required by SignPath
 
+    outputs:
+      qt5_msi: ${{ steps.export.outputs.msi_name_qt5 }}
+      qt6_msi: ${{ steps.export.outputs.msi_name_qt6 }}
+
     steps:
       # ----------------------------------------------------------------
       # 1. Checkout (to retrieve QElectroTech.wxs and sources)
@@ -38,14 +57,12 @@ jobs:
           fetch-depth: 0
 
       # ----------------------------------------------------------------
-      # 2. Download the portable artifact from the main build
+      # 2. Download the portable artifact for this flavor
-      #    Requires windows-build.yml to upload an artifact named
-      #    "qelectrotech-windows-portable" (fixed name)
       # ----------------------------------------------------------------
       - name: Download portable artifact
         uses: actions/download-artifact@v8
         with:
-          name: qelectrotech-windows-portable
+          name: ${{ matrix.portable_artifact }}
           path: artifact\files
           # workflow_run => use the triggering run's ID
           # workflow_dispatch => use input run_id if provided, otherwise current run
@@ -54,23 +71,34 @@ jobs:
           repository: ${{ github.repository }}
 
       # ----------------------------------------------------------------
-      # 3. Extract version from sources
+      # 3. Extract version
+      #    Qt5: parsed from sources/qetversion.cpp (single source of truth
+      #         for the software's own reported version).
+      #    Qt6: hardcoded "0.200.1" here — deliberately NOT parsed from the
+      #         binary/source, since Qt-version self-detection inside the
+      #         compiled code proved unreliable (see commit e1aa65f). The CI
+      #         matrix entry already knows for certain which flavor it is
+      #         packaging, so the experimental-track label is set explicitly
+      #         at the packaging level instead.
       # ----------------------------------------------------------------
       - name: Extract version
         id: version
         shell: pwsh
         run: |
-          # Version from qetversion.cpp (same logic as windows-build.yml)
+          if ("${{ matrix.version_source }}" -eq "hardcoded") {
-          $src = Get-Content "sources\qetversion.cpp" -Raw -ErrorAction SilentlyContinue
+            $ver = "0.200.1"
-          if ($src -match 'return QVersionNumber\{([^}]+)\}') {
-            $ver = $Matches[1] -replace '\s','' -replace ',','.'
           } else {
-            # Fallback: CMakeLists.txt
+            $src = Get-Content "sources\qetversion.cpp" -Raw -ErrorAction SilentlyContinue
-            $cmake = Get-Content "CMakeLists.txt" -Raw
+            if ($src -match 'return QVersionNumber\{([^}]+)\}') {
-            if ($cmake -match 'project\s*\([^)]*VERSION\s+([\d]+\.[\d]+\.[\d]+)') {
+              $ver = $Matches[1] -replace '\s','' -replace ',','.'
-              $ver = $Matches[1]
             } else {
-              $ver = "0.0.0"
+              # Fallback: CMakeLists.txt
+              $cmake = Get-Content "CMakeLists.txt" -Raw
+              if ($cmake -match 'project\s*\([^)]*VERSION\s+([\d]+\.[\d]+\.[\d]+)') {
+                $ver = $Matches[1]
+              } else {
+                $ver = "0.0.0"
+              }
             }
           }
 
@@ -89,39 +117,27 @@ jobs:
           $verParts = $ver -split '\.'
           $verMsi = "$($verParts[0]).$($verParts[1]).$($rev % 65535)"
 
-          $verDisplay = "${ver}-r${rev}-${sha}_x86_64-win64"
+          $flavorTag = "${{ matrix.label_suffix }}"
+          $verDisplay = "${ver}${flavorTag}-r${rev}-${sha}_x86_64-win64"
 
-          echo "VERSION_MSI=$verMsi"       >> $env:GITHUB_OUTPUT
+          echo "VERSION_MSI=$verMsi"         >> $env:GITHUB_OUTPUT
           echo "VERSION_DISPLAY=$verDisplay" >> $env:GITHUB_OUTPUT
           Write-Host "Version MSI     : $verMsi"
           Write-Host "Version display : $verDisplay"
 
       # ----------------------------------------------------------------
       # 4. Install WiX v7, accept EULA and install WixUI extension
-      #    All done in one step: PATH is updated within the same step
-      #    so wix is immediately available for eula and extension commands
       # ----------------------------------------------------------------
       - name: Install WiX v7
         shell: pwsh
         run: |
           dotnet tool install --global wix --version 7.0.0
-
-          # Update PATH immediately for the rest of this step
           $toolsPath = [System.IO.Path]::Combine($env:USERPROFILE, '.dotnet', 'tools')
           $env:PATH = "$toolsPath;$env:PATH"
-
-          # Also export for subsequent steps
           echo $toolsPath >> $env:GITHUB_PATH
-
-          # Accept OSMF EULA (official CI/CD method: writes a sentinel file)
           wix eula accept wix7
-
-          # Install WixUI extension
           wix extension add WixToolset.UI.wixext/7.0.0
-
-          # Install WixUtil extension (required for custom actions: Binary:Wix4UtilCA_*)
           wix extension add WixToolset.Util.wixext/7.0.0
-
           Write-Host "WiX v7 installed, EULA accepted, UI + Util extensions added."
 
       # ----------------------------------------------------------------
@@ -133,8 +149,6 @@ jobs:
           $wxs = "build-aux\windows\QElectroTech.wxs"
           if (-not (Test-Path $wxs)) {
             Write-Error "WXS file not found: $wxs"
-            Write-Host "Contents of build-aux\windows\ :"
-            Get-ChildItem "build-aux\windows\" -ErrorAction SilentlyContinue
             exit 1
           }
           Write-Host "WXS found: $wxs"
@@ -145,14 +159,8 @@ jobs:
       - name: Check artifact structure
         shell: pwsh
         run: |
-          Write-Host "=== Contents of artifact\files (2 levels) ==="
-          Get-ChildItem -Path "artifact\files" -Depth 2 |
-            Select-Object FullName | Format-Table -AutoSize
-
-          # Search for qelectrotech.exe in the artifact
           $exe = Get-ChildItem -Path "artifact\files" -Filter "qelectrotech.exe" -Recurse | Select-Object -First 1
           if (-not $exe) {
-            # Also try QElectroTech.exe (capital Q)
             $exe = Get-ChildItem -Path "artifact\files" -Filter "QElectroTech.exe" -Recurse | Select-Object -First 1
           }
           if (-not $exe) {
@@ -160,8 +168,6 @@ jobs:
             exit 1
           }
           Write-Host "Executable: $($exe.FullName) ($([math]::Round($exe.Length/1MB,1)) MB)"
-
-          # FilesDir = folder containing bin\
           $binDir    = $exe.Directory.FullName
           $filesDir  = Split-Path $binDir -Parent
           echo "FILES_DIR=$filesDir" >> $env:GITHUB_ENV
@@ -169,31 +175,23 @@ jobs:
 
       # ----------------------------------------------------------------
       # 7. Convert LICENSE (GPL-2) to RTF for the WixUI licence screen
-      #    RTF is the only format accepted by Windows Installer.
-      #    The conversion wraps plain text lines in basic RTF markup.
       # ----------------------------------------------------------------
       - name: Convert LICENSE to RTF
         shell: pwsh
         run: |
           $licSrc = "LICENSE"
           $licRtf = "$env:TEMP\License.rtf"
-
           if (-not (Test-Path $licSrc)) {
             Write-Error "LICENSE file not found in repository root"
             exit 1
           }
-
           $lines = Get-Content $licSrc -Encoding UTF8
-
-          # RTF header — Courier New, 9pt, black
           $rtf = New-Object System.Text.StringBuilder
           [void]$rtf.AppendLine('{\rtf1\ansi\ansicpg1252\deff0')
           [void]$rtf.AppendLine('{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}}')
           [void]$rtf.AppendLine('{\colortbl;\red0\green0\blue0;}')
           [void]$rtf.AppendLine('\f0\fs18\cf1')
-
           foreach ($line in $lines) {
-            # Escape RTF special characters
             $escaped = $line `
               -replace '\\', '\\\\' `
               -replace '\{', '\{' `
@@ -201,16 +199,12 @@ jobs:
             [void]$rtf.AppendLine("$escaped\par")
           }
           [void]$rtf.AppendLine('}')
-
           [System.IO.File]::WriteAllText($licRtf, $rtf.ToString(), [System.Text.Encoding]::ASCII)
           echo "LICENSE_RTF=$licRtf" >> $env:GITHUB_ENV
-          Write-Host "License.rtf generated: $licRtf ($([math]::Round((Get-Item $licRtf).Length/1KB,1)) KB)"
+          Write-Host "License.rtf generated: $licRtf"
 
       # ----------------------------------------------------------------
       # 8. Replace Lancer QET.bat with the MSI-specific version
-      #    The portable version uses relative paths suited for the zip.
-      #    The MSI version uses %~dp0 to resolve paths relative to
-      #    the installation directory in Program Files.
       # ----------------------------------------------------------------
       - name: Replace Lancer QET.bat for MSI
         shell: pwsh
@@ -219,11 +213,12 @@ jobs:
           $content = "@echo off`r`nstart `"`" `"%~dp0bin\qelectrotech.exe`" --common-elements-dir=`"%~dp0elements/`" --common-tbt-dir=`"%~dp0titleblocks/`" --lang-dir=`"%~dp0lang/`" -style windowsvista`r`n"
           [System.IO.File]::WriteAllText($bat, $content, [System.Text.Encoding]::ASCII)
           Write-Host "Lancer QET.bat replaced for MSI installation."
-          Write-Host "=== Content of new Lancer QET.bat ==="
-          Get-Content $bat
 
       # ----------------------------------------------------------------
       # 9. Build the MSI (unsigned)
+      #    Qt6 (experimental) uses a distinct ProductCode seed so it never
+      #    collides with / upgrades over the Qt5 MSI — they must be able to
+      #    coexist as clearly separate installs.
       # ----------------------------------------------------------------
       - name: Build MSI
         shell: pwsh
@@ -235,24 +230,18 @@ jobs:
           $wxs        = "build-aux\windows\QElectroTech.wxs"
           $outputName = "QElectroTech-${verDisplay}.msi"
 
-          # Deterministic ProductCode GUID (UUID v5) based on version.
+          $seed      = "qelectrotech-msi-${{ matrix.flavor }}-$version"
-          # Same version => same GUID (required for MSI repair/uninstall).
-          # Different version => different GUID (triggers a proper upgrade).
-          $seed      = "qelectrotech-msi-$version"
           $sha1      = [System.Security.Cryptography.SHA1]::Create()
           $hash      = $sha1.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($seed))
-          $hash[6]   = ($hash[6] -band 0x0F) -bor 0x50   # UUID version 5
+          $hash[6]   = ($hash[6] -band 0x0F) -bor 0x50
-          $hash[8]   = ($hash[8] -band 0x3F) -bor 0x80   # RFC4122 variant
+          $hash[8]   = ($hash[8] -band 0x3F) -bor 0x80
           $productCode = "{$([System.Guid]::new([byte[]]$hash[0..15]).ToString().ToUpper())}"
 
           New-Item -ItemType Directory -Force -Path "dist" | Out-Null
 
-          Write-Host "=== wix build ==="
+          Write-Host "=== wix build (${{ matrix.flavor }}) ==="
-          Write-Host " WXS         : $wxs"
           Write-Host " Version     : $version"
           Write-Host " ProductCode : $productCode"
-          Write-Host " FilesDir    : $filesDir"
-          Write-Host " LicenseRtf  : $licRtf"
           Write-Host " Output      : dist\$outputName"
 
           wix build $wxs `
@@ -272,34 +261,18 @@ jobs:
           }
 
           $size = [math]::Round((Get-Item "dist\$outputName").Length / 1MB, 1)
-          Write-Host "MSI generated: dist\$outputName ($size MB) ✓"
+          Write-Host "MSI generated: dist\$outputName ($size MB) OK"
           echo "MSI_NAME=$outputName" >> $env:GITHUB_ENV
 
-      # ----------------------------------------------------------------
-      # 9b. Upload unsigned MSI as artifact (required by SignPath)
-      #     SignPath fetches artifacts directly from GitHub Actions,
-      #     so the MSI must be uploaded before the signing request.
-      #     We capture the artifact-id output for use by SignPath.
-      # ----------------------------------------------------------------
       - name: Upload unsigned MSI artifact (pre-signing)
         id: upload_unsigned
         uses: actions/upload-artifact@v7
         with:
-          name: qelectrotech-windows-msi-unsigned
+          name: qelectrotech-windows-msi-unsigned-${{ matrix.flavor }}
           path: dist\*.msi
           retention-days: 1
           if-no-files-found: error
 
-      # ----------------------------------------------------------------
-      # 9c. Submit signing request to SignPath (OSS organization)
-      #     Prerequisites:
-      #       - SIGNPATH_API_TOKEN    : CI user token from the OSS org
-      #       - SIGNPATH_ORGANIZATION_ID : Organization ID of the OSS org
-      #         (visible in app.signpath.io → Settings after accepting
-      #          the OSS invitation)
-      #     The action downloads the signed MSI and places it in
-      #     dist/ (overwriting the unsigned one).
-      # ----------------------------------------------------------------
       - name: Sign MSI via SignPath
         uses: signpath/github-action-submit-signing-request@v2
         with:
@@ -312,33 +285,27 @@ jobs:
           wait-for-completion: true
           output-artifact-directory: 'dist\'
 
-      # ----------------------------------------------------------------
+      - name: Upload signed MSI artifact
-      # 10. Upload the signed MSI artifact
-      # ----------------------------------------------------------------
-      - name: Upload MSI artifact
         uses: actions/upload-artifact@v7
         with:
-          name: qelectrotech-windows-msi
+          name: qelectrotech-windows-msi-${{ matrix.flavor }}
           path: dist\*.msi
           retention-days: 14
           if-no-files-found: error
 
-      # ----------------------------------------------------------------
+      - name: Delete old nightly .msi asset for this flavor
-      # 11. Delete old .msi asset then upload new MSI to nightly release
-      # ----------------------------------------------------------------
-      - name: Delete old nightly .msi asset
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}
         run: |
-          gh release view nightly --repo "$REPO" --json assets \
+          $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6-EXPERIMENTAL.*\.msi$" } else { "\.msi$" }
-            --jq '.assets[] | select(.name | test("\\.msi$")) | .name' \
+          $names = gh release view nightly --repo $env:REPO --json assets --jq ".assets[] | select(.name | test(`"$pattern`")) | .name"
-            | while read -r name; do
+          foreach ($name in ($names -split "`n" | Where-Object { $_ })) {
-                echo "Deleting old asset: $name"
+            if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6-EXPERIMENTAL") { continue }
-                gh release delete-asset nightly "$name" --repo "$REPO" --yes
+            Write-Host "Deleting old asset: $name"
-              done
+            gh release delete-asset nightly $name --repo $env:REPO --yes
-          echo "Old .msi assets deleted."
+          }
-        shell: bash
+        shell: pwsh
 
       - name: Upload MSI to nightly release
         uses: softprops/action-gh-release@v3
@@ -349,30 +316,40 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # ----------------------------------------------------------------
+      - name: Export MSI name for page generation
-      # 12. Summary
+        id: export
-      # ----------------------------------------------------------------
+        shell: pwsh
+        run: |
+          $name = "$env:MSI_NAME"
+          if ("${{ matrix.flavor }}" -eq "qt6") {
+            echo "msi_name_qt6=$name" >> $env:GITHUB_OUTPUT
+          } else {
+            echo "msi_name_qt5=$name" >> $env:GITHUB_OUTPUT
+          }
+
       - name: Summary
         if: always()
         shell: pwsh
         run: |
-          Write-Host "=== MSI build summary ==="
+          Write-Host "=== MSI build summary (${{ matrix.flavor }}) ==="
           Write-Host "Version : ${{ steps.version.outputs.VERSION_DISPLAY }}"
-          Write-Host "WiX     : v7.0.0"
+          Write-Host "Experimental : ${{ matrix.experimental }}"
-          Write-Host "Signing : SignPath OSS"
-          Write-Host "Runner  : ${{ runner.os }} / ${{ runner.arch }}"
-          if (Test-Path "dist\$env:MSI_NAME") {
-            $size = [math]::Round((Get-Item "dist\$env:MSI_NAME").Length / 1MB, 1)
-            Write-Host "MSI     : $env:MSI_NAME ($size MB) ✓"
-          } else {
-            Write-Host "MSI     : FAILED ✗"
-          }
 
-      # ----------------------------------------------------------------
+  # ---------------------------------------------------------------------------
-      # 13. Generate and deploy the GitHub Pages download page
+  # Job 2 : Génère et déploie la page GitHub Pages une fois les DEUX MSI
-      #     Toutes les URLs sont connues ici (exe, zip, msi).
+  # (Qt5 + Qt6) publiés, pour que toutes les URLs soient connues.
-      # ----------------------------------------------------------------
+  # ---------------------------------------------------------------------------
-      - name: Checkout (for generate-page.py)
+  deploy-pages:
+    needs: build-msi
+    runs-on: ubuntu-latest
+    if: always() && needs.build-msi.result == 'success'
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+
+    steps:
+      - name: Checkout master (for generate-page.py)
         uses: actions/checkout@v7
         with:
           ref: master
@@ -386,15 +363,17 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
-
           REPO="${{ github.repository }}"
 
-          # Fetch asset names from the nightly release (source of truth)
           ASSETS=$(gh release view nightly --repo "$REPO" --json assets --jq '.assets[].name')
 
-          EXE_NAME=$(echo "$ASSETS" | grep '\.exe$'  | head -1)
+          EXE_NAME=$(echo "$ASSETS" | grep -v 'qt6' | grep '\.exe$' | head -1)
-          ZIP_NAME=$(echo "$ASSETS" | grep '\.zip$'  | head -1)
+          ZIP_NAME=$(echo "$ASSETS" | grep -v 'qt6' | grep '\.zip$' | head -1)
-          MSI_NAME=$(echo "$ASSETS" | grep '\.msi$'  | head -1 || echo "")
+          MSI_NAME=$(echo "$ASSETS" | grep -v 'qt6' | grep '\.msi$' | head -1 || echo "")
+
+          EXE_QT6_NAME=$(echo "$ASSETS" | grep 'qt6' | grep '\.exe$' | head -1 || echo "")
+          ZIP_QT6_NAME=$(echo "$ASSETS" | grep 'qt6' | grep '\.zip$' | head -1 || echo "")
+          MSI_QT6_NAME=$(echo "$ASSETS" | grep 'qt6' | grep '\.msi$' | head -1 || echo "")
 
           BASE="https://github.com/$REPO/releases/download/nightly"
           INSTALLER_URL="$BASE/$EXE_NAME"
@@ -402,6 +381,13 @@ jobs:
           MSI_URL=""
           [ -n "$MSI_NAME" ] && MSI_URL="$BASE/$MSI_NAME"
 
+          INSTALLER_QT6_URL=""
+          PORTABLE_QT6_URL=""
+          MSI_QT6_URL=""
+          [ -n "$EXE_QT6_NAME" ] && INSTALLER_QT6_URL="$BASE/$EXE_QT6_NAME"
+          [ -n "$ZIP_QT6_NAME" ] && PORTABLE_QT6_URL="$BASE/$ZIP_QT6_NAME"
+          [ -n "$MSI_QT6_NAME" ] && MSI_QT6_URL="$BASE/$MSI_QT6_NAME"
+
           SHA="${{ github.event.workflow_run.head_sha || github.sha }}"
           SHORT="${SHA:0:7}"
           DATE=$(date -u '+%Y-%m-%d %H:%M UTC')
@@ -410,6 +396,7 @@ jobs:
 
           export DATE SHORT REPO SHA RUN_URL RUN_NUMBER
           export INSTALLER_URL PORTABLE_URL MSI_URL
+          export INSTALLER_QT6_URL PORTABLE_QT6_URL MSI_QT6_URL
 
           python3 source/build-aux/generate-page.py
 

build-aux/generate-page.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 """
 generate-page.py — Generates gh-pages/index.html for QElectroTech nightly builds.
-Called from windows-build.yml deploy-pages job.
+Called from windows-msi.yml deploy-pages job.
 Environment variables required:
   DATE, SHORT, REPO, SHA, RUN_URL, RUN_NUMBER,
   INSTALLER_URL, PORTABLE_URL, MSI_URL (optional)
+Optional (Qt6 experimental track — omitted entirely if empty):
+  INSTALLER_QT6_URL, PORTABLE_QT6_URL, MSI_QT6_URL
 """
 import os
 
@@ -18,6 +20,10 @@ installer_url = os.environ.get("INSTALLER_URL", "")
 portable_url  = os.environ.get("PORTABLE_URL", "")
 msi_url       = os.environ.get("MSI_URL", "")
 
+installer_qt6_url = os.environ.get("INSTALLER_QT6_URL", "")
+portable_qt6_url  = os.environ.get("PORTABLE_QT6_URL", "")
+msi_qt6_url       = os.environ.get("MSI_QT6_URL", "")
+
 msi_block = ""
 if msi_url:
     msi_block = f"""
@@ -26,6 +32,46 @@ if msi_url:
 <span class="btn-text">Windows Installer .msi<small>.msi &mdash; for enterprise / GPO deployment</small></span>
 </a>"""
 
+# Qt6 experimental section — only rendered if at least one Qt6 asset exists.
+qt6_block = ""
+if installer_qt6_url or portable_qt6_url or msi_qt6_url:
+    qt6_msi_btn = ""
+    if msi_qt6_url:
+        qt6_msi_btn = f"""
+<a class="btn btn-msi" href="{msi_qt6_url}">
+<span class="btn-icon">&#11015;</span>
+<span class="btn-text">Windows Installer .msi (Qt6)<small>.msi &mdash; experimental, for enterprise / GPO deployment</small></span>
+</a>"""
+    qt6_installer_btn = ""
+    if installer_qt6_url:
+        qt6_installer_btn = f"""
+<a class="btn btn-primary" href="{installer_qt6_url}">
+<span class="btn-icon">&#11015;</span>
+<span class="btn-text">Windows Installer (Qt6)<small>.exe &mdash; experimental, includes all dependencies</small></span>
+</a>"""
+    qt6_portable_btn = ""
+    if portable_qt6_url:
+        qt6_portable_btn = f"""
+<a class="btn btn-secondary" href="{portable_qt6_url}">
+<span class="btn-icon">&#128230;</span>
+<span class="btn-text">Windows Portable (Qt6)<small>.zip &mdash; experimental, no installation required</small></span>
+</a>"""
+
+    qt6_block = f"""
+<div class="card">
+<h2>&#129514; Windows &mdash; x86_64 &mdash; Qt6 track</h2>
+<div class="warning">
+&#9888;&#65039; <strong>Experimental.</strong> These Qt6-based installer, portable and MSI
+builds are new and not as thoroughly tested as the Qt5 track above. Expect rough
+edges; please report issues and mention &quot;Qt6&quot; explicitly.
+</div>
+<div class="downloads">
+{qt6_installer_btn}
+{qt6_msi_btn}
+{qt6_portable_btn}
+</div>
+</div>"""
+
 html = f"""<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -80,7 +126,7 @@ For production use, download a <a href="https://github.com/{repo}/releases">stab
 </div>
 </div>
 <div class="card">
-<h2>&#127993; Windows &mdash; x86_64</h2>
+<h2>&#127993; Windows &mdash; x86_64 &mdash; Qt5 track</h2>
 <div class="downloads">
 <a class="btn btn-primary" href="{installer_url}">
 <span class="btn-icon">&#11015;</span>
@@ -97,6 +143,7 @@ For production use, download a <a href="https://github.com/{repo}/releases">stab
 </a>
 </div>
 </div>
+{qt6_block}
 </main>
 <footer>
 Auto-generated by GitHub Actions &nbsp;&middot;&nbsp;