Merge pull request #1791 from xiaoyifang/staged

dev: make new test build
xiaoyifang · Sep 30, 2024 · c0c164c · c0c164c
2 parents 8cb9d11 + 4a0124d
commit c0c164c
Show file tree

Hide file tree

Showing 94 changed files with 61,986 additions and 62,422 deletions.
diff --git a/.github/workflows/PR-check-cmake.yml b/.github/workflows/PR-check-cmake.yml
@@ -86,7 +86,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.7.2
+          version: 6.7.3
           arch: win64_msvc2019_64
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech 
           setup-python: 'false'

diff --git a/.github/workflows/release-AutoTag.yml b/.github/workflows/release-AutoTag.yml
@@ -22,8 +22,8 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 24.05.13
-      version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'NextNameHere' }}
+      version: 24.11.0
+      version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }}
       prerelease: ${{ !contains(github.ref_name,'master') }}
 
     steps:

diff --git a/.github/workflows/release-macos-homebrew.yml b/.github/workflows/release-macos-homebrew.yml
@@ -23,12 +23,12 @@ jobs:
     strategy:
       matrix:
         os: [macos-12,macos-14]
-        qt_ver: [ 6.7.2,6.6.3 ]
+        qt_ver: [ 6.7.3,6.6.3 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.05.13
-      version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'NextNameHere' }}
+      version: 24.11.0
+      version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }}
       prerelease: ${{ !contains(github.ref_name,'master') }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml
@@ -21,11 +21,11 @@ jobs:
     strategy:
       matrix:
         os: [windows-2022]
-        qt_ver: [ 6.7.2, 6.6.3 ]
+        qt_ver: [ 6.7.3, 6.6.3 ]
         qt_arch: [win64_msvc2019_64]
     env:
-      version: 24.05.13
-      versionSuffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'NextNameHere' }}
+      version: 24.11.0
+      versionSuffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'Release' }}
       prerelease: ${{ !contains(github.ref_name,'master') }}
     steps:
       - name: Install Qt

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ endif ()
 include(FeatureSummary)
 
 project(goldendict-ng
-        VERSION 24.05.13
+        VERSION 24.11.0
         LANGUAGES CXX C)
 
 set(GOLDENDICT "goldendict") # binary/executable name
@@ -167,6 +167,7 @@ target_include_directories(${GOLDENDICT} PRIVATE
         ${PROJECT_SOURCE_DIR}/src/
         ${PROJECT_SOURCE_DIR}/src/common
         ${PROJECT_SOURCE_DIR}/src/dict
+        ${PROJECT_SOURCE_DIR}/src/dict/utils
         ${PROJECT_SOURCE_DIR}/src/ui
         )
 

diff --git a/locale/ar_SA.ts b/locale/ar_SA.ts
diff --git a/locale/ay_BO.ts b/locale/ay_BO.ts
diff --git a/locale/be_BY.ts b/locale/be_BY.ts
diff --git a/locale/bg_BG.ts b/locale/bg_BG.ts