Merge branch 'master' of https://github.com/Sigil-Ebook/PageEdit

.github/workflows/create_tag.yml

@@ -31,10 +31,10 @@ jobs:
       if: ${{ steps.check_tag_name.outputs.match != '' }}
       uses: crazy-max/ghaction-import-gpg@v5
       with:
-        gpg-private-key: ${{ secrets.NEW_SIGNING_STUFF }}
+        gpg_private_key: ${{ secrets.NEW_SIGNING_STUFF }}
         passphrase: ${{ secrets.SIGNING_BONUS_PHRASE }}
-        git-user-signingkey: true
-        git-tag-gpgsign: true
+        git_user_signingkey: true
+        git_tag_gpgsign: true
 
     - name: Sign and Push Tag
       id: create_archive

.github/workflows/linux-build.yml

@@ -15,7 +15,6 @@ on:
     - '.retired_travis.yml'
     - '.retired_appveyor.yml'
     - '**.md'
-    - '**/reset-**-caches.txt'
 
   pull_request:
     branches: [ master ]
@@ -31,15 +30,14 @@ on:
     - '.retired_travis.yml'
     - '.retired_appveyor.yml'
     - '**.md'
-    - '**/reset-**-caches.txt'
 
 env:
   BUILD_TYPE: Debug
 
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
@@ -54,9 +52,9 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: '5.9.5'
+        version: '6.5.2'
         dir: ${{runner.workspace}}/Qt
-        modules: 'qtwebengine'
+        modules: 'qtwebengine qtpositioning qt5compat qtpdf qtwebchannel'
         setup-python: 'true'
         cache: ${{ steps.cache-qt.outputs.cache-hit }}
 
@@ -76,5 +74,6 @@ jobs:
       run: |
         cmake $GITHUB_WORKSPACE \
         -G "Ninja" \
+        -DCMAKE_PREFIX_PATH="{$QT_ROOT_DIR}/lib/cmake" \
         -DCMAKE_BUILD_TYPE=$BUILD_TYPE
         ninja -j$(getconf _NPROCESSORS_ONLN)

.github/workflows/mac-build.yml

@@ -82,7 +82,6 @@ jobs:
       run: |
         cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=11 \
         -DCMAKE_BUILD_TYPE=Release \
-        -DUSE_QT6=1 \
         -DCMAKE_CXX_FLAGS=-Wno-inconsistent-missing-override \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/${{env.QT}}/lib/cmake \
         -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/ $GITHUB_WORKSPACE  

.github/workflows/reset-lin-caches.txt

@@ -1 +1,3 @@
 Change the content of this file to reset the caches for the github actions sigil linux build
+
+reset cache on 4 September 2023

.github/workflows/reset-win-caches.txt

@@ -1,3 +1,5 @@
 Change the content of this file to reset the caches for the github actions sigil windows build
 
 reset cache on 26 July 2023
+reset cache on 26 August 2023
+reset cache on 4 September 2023

.github/workflows/win-build.yml

@@ -76,12 +76,11 @@ jobs:
       working-directory: ${{runner.workspace}}\build
       run: |
         set PATH=${{runner.workspace}}\%QT%\bin;%PATH%
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.37
         echo %PATH%
         cmake %GITHUB_WORKSPACE% ^
         -G "Ninja" ^
         -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-        -DUSE_QT6=1 ^
         -DQt6_DIR="${{runner.workspace}}\$QT\lib\cmake\Qt6" ^
         %CMAKE64BIT%
         ninja -j2
@@ -96,11 +95,9 @@ jobs:
         set REDIST=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\%RedistVersion%\vc_redist.x64.exe
         echo "%REDIST%"
         cp '%REDIST%' %GITHUB_WORKSPACE%\installer\vcredist_x64.exe
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -vcvars_ver=14.37
         ninja -j2 deployinstaller
 
-
-
     - uses: actions/upload-artifact@v3
       if: "contains(github.event.head_commit.message, '[deploy]')"
       with:

CMakeLists.txt

@@ -73,9 +73,9 @@ add_subdirectory( gumbo_subtree/src )
 # Pull in th proper cmake file depending on whether
 # a qt5 or qt6 build was requested (defaults to qt5)
 
-if (${USE_QT6})
-    include(CMakeLists6.txt)
-else()
+if (${USE_QT5})
     include(CMakeLists5.txt)
+else()
+    include(CMakeLists6.txt)
 endif()