Skip to content

Commit c484b91

Browse files
committed
[build]: 升级Qt版本至6.9.2并重构跨平台打包系统
- 核心依赖: 将Qt版本从6.9.1统一升级到6.9.2,更新相关配置文件和CI流程 - 开发体验: 重写Windows开发环境设置脚本为Enter-VsDevShell.ps1,支持多版本VS和架构选择 - 打包系统: 完全重构跨平台打包脚本,移除各平台独立的build.py,引入统一的upload.py和utils.py - 平台支持: 新增对macOS(aarch64/x86_64)和Ubuntu(aarch64/x86_64)多架构的完整打包支持 - 文档完善: 全面重写README为双语文档,为每个示例添加详细说明和视觉展示 - 代码清理: 移除过时的脚本和资源文件,优化项目结构,统一工具链配置
1 parent c3173d0 commit c484b91

23 files changed

Lines changed: 697 additions & 819 deletions

File tree

.github/actions/install-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
qt_ver:
1010
description: 'qt version'
1111
required: false
12-
default: '6.9.1'
12+
default: '6.9.2'
1313
type: string
1414

1515
runs:

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
if: startsWith(matrix.os, 'windows')
4848
shell: pwsh
4949
run: |
50-
.\scripts\windows\setVsDev.ps1
50+
.\packaging\windows\Enter-VsDevShell.ps1
5151
cmake `
5252
-S . `
5353
-B ./build `

.github/workflows/qmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: startsWith(matrix.os, 'windows')
5353
shell: pwsh
5454
run: |
55-
..\scripts\windows\setVsDev.ps1
55+
..\packaging\windows\Enter-VsDevShell.ps1
5656
& qmake ./../.
5757
& jom
5858
working-directory: build

.github/workflows/readme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v5
1616
- name: Setup Node.js
17-
uses: actions/setup-node@v4
17+
uses: actions/setup-node@v5
1818
# ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
1919
- name: Adding README - English
2020
uses: dephraiim/translate-readme@main

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
},
55
"cmake.generator": "Ninja",
66
"cmake.environment": {
7-
"PATH": "C:\\Qt\\6.9.1\\msvc2022_64\\bin;${env:PATH};"
7+
"PATH": "C:\\Qt\\6.9.2\\msvc2022_64\\bin;${env:PATH};"
88
}
99
}

README.md

Lines changed: 204 additions & 133 deletions
Large diffs are not rendered by default.

cmake/qt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
if(CMAKE_HOST_WIN32)
2-
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.9.1\\msvc2022_64")
2+
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.9.2\\msvc2022_64")
33
elseif(CMAKE_HOST_APPLE)
44

55
elseif(CMAKE_HOST_LINUX)
6-
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.9.1/gcc_64")
6+
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.9.2/gcc_64")
77
endif()
88

99
add_definitions(-DQT_DEPRECATED_WARNINGS

packaging/activate_venv.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

packaging/macos/build.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

packaging/macos/distribution.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)