Skip to content

Commit 8eeebc4

Browse files
committed
build: Updated ASuiteComps for global hotkey in qt6
1 parent 48377a9 commit 8eeebc4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ jobs:
118118
- name: Install Dependencies (Ubuntu - only QT6)
119119
if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
120120
run: |
121-
wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_2_2-1_amd64.deb
122-
wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas-dev_2_2-1_amd64.deb
123-
sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev
124-
sudo dpkg -i libqt6pas6_2_2-1_amd64.deb
125-
sudo dpkg -i libqt6pas-dev_2_2-1_amd64.deb
121+
wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_6.2.2-2_amd64.deb
122+
wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6-dev_6.2.2-2_amd64.deb
123+
sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
124+
sudo dpkg -i libqt6pas6_6.2.2-2_amd64.deb
125+
sudo dpkg -i libqt6pas6-dev_6.2.2-2_amd64.deb
126126
cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
127127
qmake6
128128
make
@@ -140,7 +140,7 @@ jobs:
140140
path: |
141141
${{ env.LAZ_DIR }}
142142
${{ env.ASUITE_SOURCE }}/3p/mORMot2/static
143-
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('.cache') }}
143+
key: ${{ runner.os }}-${{ env.cache-name }}_${{ matrix.config.build-widgetset }}-${{ hashFiles('.cache') }}
144144

145145
- name: Install Lazarus
146146
if: steps.cache.outputs.cache-hit != 'true' && matrix.config.build-widgetset == 'qt6'

0 commit comments

Comments
 (0)