Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-30 22:49:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actions: Improve "Install Qt" job (#374)

Browse Source 
* Actions: Define qt_arch in matrix

* Update build.yml

* Update main.cpp
This commit is contained in:
parhelia512 2025-04-20 17:37:06 -04:00 committed by GitHub
parent cb87d0f07c
commit 9e1272984a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build.yml vendored
View File

@ -75,6 +75,7 @@ jobs:
- platform: windows-latest - platform: windows-latest
qt_version: "6.9.0" qt_version: "6.9.0"
target: amd64 target: amd64
qt_arch: win64_mingw
- platform: ubuntu-22.04 - platform: ubuntu-22.04
qt_version: "6.9.0" qt_version: "6.9.0"
target: amd64 target: amd64
@ -102,20 +103,10 @@ jobs:
with: with:
path: download-artifact path: download-artifact
# ========================================================================================================= Qt Install # ========================================================================================================= Qt Install
- name: Install Qt Windows
uses: jurplel/install-qt-action@v4.1.1
if: matrix.platform == 'windows-latest'
with:
arch: win64_mingw
version: ${{ matrix.qt_version }}
setup-python: true
modules: qtcharts
cache: true
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.target }}
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4.1.1 uses: jurplel/install-qt-action@v4.1.1
if: matrix.platform != 'windows-latest'
with: with:
arch: ${{ matrix.qt_arch }}
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}
setup-python: true setup-python: true
modules: qtcharts modules: qtcharts

1
src/main.cpp
View File

@ -17,7 +17,6 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "include/sys/windows/MiniDump.h" #include "include/sys/windows/MiniDump.h"
#include "include/sys/windows/vcCheck.h"
#include "include/sys/windows/eventHandler.h" #include "include/sys/windows/eventHandler.h"
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX