diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 750ef02..5e6c601 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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: @@ -26,7 +30,7 @@ jobs: - macos-latest - ubuntu-latest qt_ver: - - 6.4.0 + - 6.5.0 build_type: - "Release" generators: diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml index 779e9b5..8a068a1 100644 --- a/.github/workflows/qmake.yml +++ b/.github/workflows/qmake.yml @@ -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 @@ -25,7 +30,7 @@ jobs: - macos-latest - ubuntu-latest qt_ver: - - 6.4.0 + - 6.5.0 steps: - name: Install Qt @@ -52,4 +57,4 @@ jobs: if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu') run: | qmake - make + make -j4 diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml new file mode 100644 index 0000000..0cf4fb1 --- /dev/null +++ b/.github/workflows/readme.yml @@ -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 \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 7177d5e..34d9b46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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;" } } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9efb44b..1257b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/README.md b/README.md index 86d5a5d..11e93e1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Qt的一些简单常用示例 +- [简体中文](README.md) +- [English](README.en.md) + ## 1. [Battery](Battery/)——电池;