1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-24 08:58:40 -05:00

Merge branch 'f4exb:master' into mac_ci

This commit is contained in:
srcejon 2024-11-10 12:53:53 +00:00 committed by GitHub
commit d69ca4d1f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -75,7 +75,7 @@ jobs:
dir: ${{matrix.config.QT_INST_DIR}} dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{matrix.config.QT_ARCH}} arch: ${{matrix.config.QT_ARCH}}
setup-python: false setup-python: false
modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
- name: build sdrangel on Windows - name: build sdrangel on Windows
if: startsWith(matrix.config.os, 'windows') if: startsWith(matrix.config.os, 'windows')
run: | run: |

View File

@ -72,7 +72,7 @@ jobs:
dir: ${{matrix.config.QT_INST_DIR}} dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{matrix.config.QT_ARCH}} arch: ${{matrix.config.QT_ARCH}}
setup-python: false setup-python: false
modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
- name: build sdrangel on Windows - name: build sdrangel on Windows
if: startsWith(matrix.config.os, 'windows') if: startsWith(matrix.config.os, 'windows')
run: | run: |