From 1bb81c8fc1496a6b31b8b315a4507c6b50fdf500 Mon Sep 17 00:00:00 2001 From: YiFang Xiao Date: Fri, 16 Feb 2024 09:10:07 +0800 Subject: [PATCH] upgrade to qt6.6.2 --- .github/workflows/AutoTag.yml | 2 +- .github/workflows/macos-arm-homebrew.yml | 4 ++-- .github/workflows/macos-homebrew-breakpad.yml | 2 +- .github/workflows/macos-homebrew.yml | 4 ++-- .github/workflows/ubuntu-6.2.yml | 4 ++-- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-6.x.yml | 4 ++-- .github/workflows/windows.yml | 2 +- CMakeLists.txt | 2 +- goldendict.pro | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml index 55fa525ea..02f147a59 100644 --- 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 index 24e054bcf..19335297e 100644 --- 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 index 565ade5e5..576ff7010 100644 --- 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 index edf1a6e23..e61f8ff4e 100644 --- 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 index 9e60925c8..b7b3fd8a6 100644 --- 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 index f78922757..5221bf16f 100644 --- 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 index a786ef11f..4462e3aa7 100644 --- 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 index b9853a86e..6cb4118e2 100644 --- 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 index 6cfe2d521..f1fc886b1 100644 --- 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 index c5d0140f3..c45fc1572 100644 --- 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