Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
benma committed Feb 26, 2025
1 parent 1503ce8 commit 10b4a7a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ jobs:
# qtwebengine is for rendering the frontend.
run: |
pip install aqtinstall
aqt install-qt mac desktop 6.2.4 --modules qtpositioning qtserialport qtwebchannel qtwebengine --outputdir ~/Qt
echo "$HOME/Qt/6.2.4/macos/bin" >> $GITHUB_PATH
echo "$HOME/Qt/6.2.4/macos/libexec" >> $GITHUB_PATH
aqt install-qt mac desktop 6.5.3 --modules qtpositioning qtserialport qtwebchannel qtwebengine --outputdir ~/Qt
echo "$HOME/Qt/6.5.3/macos/bin" >> $GITHUB_PATH
echo "$HOME/Qt/6.5.3/macos/libexec" >> $GITHUB_PATH
- name: Build macOS app
run: >
./scripts/github-ci.sh qt-osx;
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.2'
version: '6.5'
host: 'windows'
target: 'desktop'
arch: 'win64_msvc2019_64'
Expand Down
1 change: 0 additions & 1 deletion frontends/qt/BitBox.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CFORTIFY = -O2 -D_FORTIFY_SOURCE=2
CSTACK = -fstack-protector-all -fstack-check
CMISC = -fwrapv
CASLR = -fPIE -fPIC
CONFIG += debug
# The following define makes your compiler emit warnings if you use
# any feature of Qt which has been marked as deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pip install -U pip && pip install aqtinstall
# qtpositioning depends on qtserialport.
# qtwebchannel is for the JS/backend bridge.
# qtwebengine is for rendering the frontend.
aqt install-qt linux desktop 6.5.3 -m qtpositioning qtserialport qtwebchannel qtwebengine debug_info --outputdir /opt/qt6
aqt install-qt linux desktop 6.5.3 -m qtpositioning qtserialport qtwebchannel qtwebengine --outputdir /opt/qt6

npm install -g npm@10
npm install -g locize-cli
Expand Down

0 comments on commit 10b4a7a

Please sign in to comment.