Skip to content

Commit

Permalink
6.5.0;
Browse files Browse the repository at this point in the history
  • Loading branch information
RealChuan committed Apr 4, 2023
1 parent 608092e commit f136822
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 17 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ name: CMake Build
on:
push:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'LICENSE'
- 'picture'
- '.clang-format'
- '.gitignore'
- 'README.md'
- 'Scripts/**'
- 'LICENSE'
- 'README*'
- 'Scripts'
pull_request:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'LICENSE'
- 'picture'
- '.clang-format'
- '.gitignore'
- 'README.md'
- 'Scripts/**'
- 'LICENSE'
- 'README*'
- 'Scripts'

jobs:
build:
Expand All @@ -26,7 +30,7 @@ jobs:
- macos-latest
- ubuntu-latest
qt_ver:
- 6.4.0
- 6.5.0
build_type:
- "Release"
generators:
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/qmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ name: QMake Build
on:
push:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'LICENSE'
- 'picture'
- '.clang-format'
- '.gitignore'
- 'README.md'
- 'Scripts/**'
- 'LICENSE'
- 'README*'
- 'Scripts'
pull_request:
paths-ignore: # 下列文件的变更不触发部署,可以自行添加
- 'LICENSE'
- 'picture'
- '.clang-format'
- '.gitignore'
- 'README.md'
- 'Scripts/**'
- 'LICENSE'
- 'README*'
- 'Scripts'

jobs:
build:
name: Build
Expand All @@ -25,7 +30,7 @@ jobs:
- macos-latest
- ubuntu-latest
qt_ver:
- 6.4.0
- 6.5.0

steps:
- name: Install Qt
Expand All @@ -52,4 +57,4 @@ jobs:
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
run: |
qmake
make
make -j4
24 changes: 24 additions & 0 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Translate README

on:
push:
branches:
- main
- master
paths:
- README.md

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 12.x
# ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
- name: Adding README - English
uses: dephraiim/translate-readme@main
with:
LANG: en
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"cmake.configureEnvironment": {
"CMAKE_MAKE_PROGRAM": "C:\\Qt\\Tools\\Ninja\\ninja.exe"
},
"cmake.generator": "Ninja",
"cmake.environment": {
"PATH": "C:\\Qt\\6.4.0\\msvc2019_64\\bin;"
"PATH": "C:\\Qt\\6.5.0\\msvc2019_64\\bin;"
}
}
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ project(Qt-Examples VERSION 0.1 LANGUAGES CXX)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

set(CMAKE_PREFIX_PATH "C:\\Qt\\6.4.0\\msvc2019_64")
IF (CMAKE_HOST_WIN32)
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.5.0\\msvc2019_64")
ENDIF ()

set(CMAKE_INCLUDE_CURRENT_DIR ON)

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Qt的一些简单常用示例

- [简体中文](README.md)
- [English](README.en.md)

## 1. [Battery](Battery/)——电池;

<table>
Expand Down

0 comments on commit f136822

Please sign in to comment.