build: Updated ASuiteComps for global hotkey in qt6

salvadorbs · Dec 1, 2022 · 8eeebc4 · 8eeebc4
1 parent 48377a9
commit 8eeebc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -118,11 +118,11 @@ jobs:
     - name: Install Dependencies (Ubuntu - only QT6)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
       run: |
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_2_2-1_amd64.deb
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas-dev_2_2-1_amd64.deb
-        sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev
-        sudo dpkg -i libqt6pas6_2_2-1_amd64.deb
-        sudo dpkg -i libqt6pas-dev_2_2-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_6.2.2-2_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6-dev_6.2.2-2_amd64.deb
+        sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
+        sudo dpkg -i libqt6pas6_6.2.2-2_amd64.deb
+        sudo dpkg -i libqt6pas6-dev_6.2.2-2_amd64.deb
         cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
         qmake6
         make
@@ -140,7 +140,7 @@ jobs:
         path: |
           ${{ env.LAZ_DIR }}
           ${{ env.ASUITE_SOURCE }}/3p/mORMot2/static
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('.cache') }}     
+        key: ${{ runner.os }}-${{ env.cache-name }}_${{ matrix.config.build-widgetset }}-${{ hashFiles('.cache') }}     
 
     - name: Install Lazarus
       if: steps.cache.outputs.cache-hit != 'true' && matrix.config.build-widgetset == 'qt6'

diff --git a/3p/AsuiteComps b/3p/AsuiteComps
+2 −8		library/platform/unix/Hotkeys.Manager.Platform.pas
+4 −0		library/platform/unix/QGHotkeyHookPas.pas
+5 −0		library/platform/unix/QGHotkeyHookPas/QGHotkeyHookPas.pro
+12 −10		library/platform/unix/QGHotkeyHookPas/src/qghotkey_hook.h
+10 −0		library/platform/unix/QGHotkeyHookPas/src/qghotkey_hook_c.cpp
+4 −0		library/platform/unix/QGHotkeyHookPas/src/qghotkey_hook_c.h