Update qt to 6.8.2 now that qtinstall has fixed bug not showing qtweb…

…engine for qt 6.8.x
streetpea · Mar 2, 2025 · 0b9f81b · 0b9f81b
1 parent 77b53e2
commit 0b9f81b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/build-macos-arm.yml b/.github/workflows/build-macos-arm.yml
@@ -3,8 +3,8 @@ name: Build chiaki-ng macOSX arm64
 on:
   workflow_dispatch:
 env:
-  QT_PATH: "/opt/qt"
-  QT_VERSION: "6.7.3"
+  QT_PATH: "opt/qt"
+  QT_VERSION: "6.8.2"
 
 jobs:
   build-mac_arm64_github:
@@ -17,7 +17,12 @@ jobs:
 
       - name: Install protobuf
         run: |
-          pip3 install --user protobuf aqtinstall --break-system-packages
+          pip3 install --user protobuf --break-system-packages
+
+      - name: Install aqt
+        run: |
+          pip3 install aqtinstall --break-system-packages --target=${HOME}/pip-local/
+
       - name: Install brew dependencies
         run: |
           brew update
@@ -26,28 +31,28 @@ jobs:
 
       - name: Install qt
         run: |
-          sudo aqt install-qt -O "${QT_PATH}" mac desktop "${QT_VERSION}" clang_64 -m qtpositioning qtwebchannel qtwebsockets qtserialport qtwebengine
+          export PYTHONPATH="$HOME/pip-local"
+          "${HOME}/pip-local/bin/aqt" install-qt -O "${HOME}/${QT_PATH}" mac desktop "${QT_VERSION}" clang_64 -m qtpositioning qtwebchannel qtwebsockets qtserialport qtwebengine
 
       - name: Configure chiaki-ng
         run: |
-          cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCHIAKI_ENABLE_CLI=OFF -DCHIAKI_ENABLE_STEAMDECK_NATIVE=OFF -DCMAKE_PREFIX_PATH="$(brew --prefix)/opt/@openssl@3;$(brew --prefix)/opt/qt@6"
+          cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCHIAKI_ENABLE_CLI=OFF -DCHIAKI_ENABLE_STEAMDECK_NATIVE=OFF -DCMAKE_PREFIX_PATH="${HOME}/${QT_PATH}/${QT_VERSION}/macos"
 
       - name: Build chiaki-ng
         run: |
           export CPATH=$(brew --prefix)/opt/ffmpeg/include
-          export PATH="${QT_PATH}/${QT_VERSION}/clang_64/bin:${PATH}"
           cmake --build build --config Release --clean-first --target chiaki
 
       - name: Deploy chiaki-ng
         run: |
           cp -a build/gui/chiaki.app chiaki-ng.app
           cp scripts/qtwebengine_import.qml gui/src/qml/
-          export PATH="${QT_PATH}/${QT_VERSION}/clang_64/bin:${PATH}"
-          macdeployqt chiaki-ng.app -qmldir="$PWD/gui/src/qml" -libpath=$(brew --prefix)/lib -libpath=${QT_PATH}/${QT_VERSION}/clang_64/bin
+          export PATH="${HOME}/${QT_PATH}/${QT_VERSION}/macos/bin:${PATH}"
+          macdeployqt chiaki-ng.app -qmldir="$PWD/gui/src/qml" -libpath=$(brew --prefix)/lib -libpath=${HOME}/${QT_PATH}/${QT_VERSION}/macos/lib
           mkdir -p chiaki-ng.app/Contents/Resources/vulkan/icd.d
           wget https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.9/MoltenVK-macos.tar && tar xf MoltenVK-macos.tar
           cp MoltenVK/MoltenVK/dylib/macOS/* chiaki-ng.app/Contents/Resources/vulkan/icd.d
-          macdeployqt chiaki-ng.app -qmldir="$PWD/gui/src/qml" -libpath=$(brew --prefix)/lib -libpath=${QT_PATH}/${QT_VERSION}/clang_64/bin
+          macdeployqt chiaki-ng.app -qmldir="$PWD/gui/src/qml" -libpath=$(brew --prefix)/lib -libpath=${HOME}/${QT_PATH}/${QT_VERSION}/macos/lib
           ln -s ../../../../../../../Frameworks chiaki-ng.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents
           ln -s libvulkan.1.dylib chiaki-ng.app/Contents/Frameworks/vulkan
           codesign --force --entitlements gui/entitlements.xml --deep --sign - chiaki-ng.app

diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 env:
   QT_PATH: "/opt/qt"
-  QT_VERSION: "6.8.1"
+  QT_VERSION: "6.8.2"
 
 jobs:
   build-windows_x64-msys2:

diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -91,7 +91,7 @@ jobs:
       - name: Setup Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
           host: 'windows'
           target: 'desktop'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets qtserialport'

diff --git a/.github/workflows/build-weekly.yaml b/.github/workflows/build-weekly.yaml
@@ -103,7 +103,7 @@ jobs:
       - name: Setup Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
           host: 'windows'
           target: 'desktop'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets qtserialport'

diff --git a/.github/workflows/build-windows-portable.yml b/.github/workflows/build-windows-portable.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
           host: 'windows'
           target: 'desktop'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets qtserialport'

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
           host: 'windows'
           target: 'desktop'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets qtserialport'