Merge pull request #1403 from xiaoyifang/opt/upgrade-qt-6.6.2

upgrade to qt6.6.2
xiaoyifang · Feb 16, 2024 · fbe5335 · fbe5335
2 parents b3778da + 1bb81c8
commit fbe5335
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
 

diff --git a/.github/workflows/macos-arm-homebrew.yml b/.github/workflows/macos-arm-homebrew.yml
@@ -22,11 +22,11 @@ jobs:
     strategy:
       matrix:
         os: [flyci-macos-large-latest-m2]
-        qt_ver: [ 6.6.1 ]
+        qt_ver: [ 6.6.2 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
@@ -26,7 +26,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml
@@ -22,11 +22,11 @@ jobs:
     strategy:
       matrix:
         os: [macos-12,macos-13]
-        qt_ver: [ 6.6.1 ]
+        qt_ver: [ 6.6.2 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
@@ -21,10 +21,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        qt_ver: [ 6.6.1 ]
+        qt_ver: [ 6.6.2 ]
         qt_arch: [gcc_64]
     env:
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -25,7 +25,7 @@ jobs:
         qt_ver: [5.15.2]
         qt_arch: [gcc_64]
     env:
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml
@@ -27,11 +27,11 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [ 6.6.1 ]
+        qt_ver: [ 6.6.2 ]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,7 +27,7 @@ jobs:
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 24.01.27
+      version: 24.02.16
       version-suffix: alpha
       prerelease: true
     # 步骤

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ option(USE_ALTERNATIVE_NAME "Force the name goldendict-ng " OFF)
 include(FeatureSummary)
 
 project(goldendict-ng
-        VERSION 24.01.27
+        VERSION 24.02.16
         LANGUAGES CXX C)
 
 if (NOT USE_ALTERNATIVE_NAME)

diff --git a/goldendict.pro b/goldendict.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = goldendict
-VERSION = 24.01.27
+VERSION = 24.02.16
 
 # Generate version file. We do this here and in a build rule described later.
 # The build rule is required since qmake isn't run each time the project is
@@ -133,7 +133,7 @@ win32 {
 
     win32-msvc* {
         # VS does not recognize 22.number.alpha,cause errors during compilation under MSVC++
-        VERSION = 24.01.27 
+        VERSION = 24.02.16 
         DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS
         contains(QMAKE_TARGET.arch, x86_64) {
             DEFINES += NOMINMAX __WIN64