dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "use Qt 5.15.3"

Browse Source 
This reverts commit 5a8eb1e7aa3f9dc224727e4dc157b5ee54d975c1.
This commit is contained in:
Le Tan 2022-03-31 21:22:35 +08:00
parent 8a1bd930eb
commit 1ca899d8ab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-linux.yml vendored
View File

@ -45,12 +45,12 @@ jobs:
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt path: ../Qt
key: ${{ runner.os }}-QtCache-5.15-2 key: ${{ runner.os }}-QtCache-5.15-1
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: 5.15.3 version: 5.15.2
target: desktop target: desktop
modules: qtwebengine modules: qtwebengine
tools: tools_openssl_x64,1.1.1-4,qt.tools.openssl.gcc_64 tools: tools_openssl_x64,1.1.1-4,qt.tools.openssl.gcc_64

4
.github/workflows/ci-macos.yml vendored
View File

@ -44,12 +44,12 @@ jobs:
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt path: ../Qt
key: ${{ runner.os }}-QtCache-5.15-2 key: ${{ runner.os }}-QtCache-5.15-1
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: 5.15.3 version: 5.15.2
target: desktop target: desktop
modules: qtwebengine modules: qtwebengine
cached: ${{ steps.cache-qt.outputs.cache-hit }} cached: ${{ steps.cache-qt.outputs.cache-hit }}

4
.github/workflows/ci-win.yml vendored
View File

@ -50,12 +50,12 @@ jobs:
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
with: with:
path: ../Qt path: ../Qt
key: ${{ runner.os }}-${{matrix.config.arch}}-QtCache-5.15-2 key: ${{ runner.os }}-${{matrix.config.arch}}-QtCache-5.15-1
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: 5.15.3 version: 5.15.2
target: desktop target: desktop
arch: ${{matrix.config.arch}} arch: ${{matrix.config.arch}}
modules: qtwebengine modules: qtwebengine

2
src/src.pro
View File

@ -1,6 +1,6 @@
lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5 and above") lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5 and above")
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 15): error("requires Qt 5.15 and above") equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12): error("requires Qt 5.12 and above")
QT += core gui widgets webenginewidgets webchannel network svg printsupport QT += core gui widgets webenginewidgets webchannel network svg printsupport
QT += sql QT += sql