Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to qt6.6.2 #1403

Merged
merged 1 commit into from
Feb 16, 2024
Merged

upgrade to qt6.6.2 #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/AutoTag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest

env:
version: 24.01.27
version: 24.02.16
version-suffix: alpha
prerelease: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-arm-homebrew.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-homebrew-breakpad.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-homebrew.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-6.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-6.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 步骤
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions goldendict.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading