Merge remote-tracking branch 'origin/master' into remove_qtscript

# Conflicts:
#	.github/workflows/CompileAndRelease.yml
#	.github/workflows/CompileWindows.yml
This commit is contained in:
alemuntoni 2020-05-28 10:52:55 +02:00
commit c9b6504d7e
2 changed files with 3 additions and 0 deletions

View File

@ -197,6 +197,7 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
modules: xmlpatterns
version: '5.14.2'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
- name: Build MeshLab
run: |

View File

@ -32,6 +32,7 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
modules: xmlpatterns
version: '5.14.2'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
- name: Build MeshLab
run: |
@ -80,6 +81,7 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
modules: xmlpatterns
version: '5.14.2'
#mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
- name: Setup env variables
id: envs