Skip to content

Commit 99ece3b

Browse files
Fix builds: remove deprecated openglwidgets, use Homebrew Qt on macOS, windows-2025
1 parent 4155f9a commit 99ece3b

2 files changed

Lines changed: 8 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
platform: linux
2222
- os: macos-latest
2323
platform: macos
24-
- os: windows-2019
24+
- os: windows-2025
2525
platform: windows
2626
arch: x64
2727

@@ -60,17 +60,12 @@ jobs:
6060
- name: Install macOS dependencies
6161
if: matrix.platform == 'macos'
6262
run: |
63-
brew install fftw
64-
65-
- name: Setup Qt (macOS)
66-
if: matrix.platform == 'macos'
67-
uses: jurplel/install-qt-action@v4
68-
with:
69-
version: '5.15.2'
70-
host: 'mac'
71-
target: 'desktop'
72-
arch: 'clang_64'
73-
modules: 'qtmultimedia qtsvg'
63+
brew install fftw qt@5
64+
if [ -d "/usr/local/opt/qt5/bin" ]; then
65+
echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH
66+
else
67+
echo "/opt/homebrew/opt/qt5/bin" >> $GITHUB_PATH
68+
fi
7469
7570
- name: Setup Qt (Windows)
7671
if: matrix.platform == 'windows'
@@ -80,7 +75,6 @@ jobs:
8075
host: 'windows'
8176
target: 'desktop'
8277
arch: 'win64_msvc2019_64'
83-
modules: 'qtmultimedia qtsvg'
8478

8579
- name: Install Windows dependencies
8680
if: matrix.platform == 'windows'
@@ -113,7 +107,6 @@ jobs:
113107
else
114108
FFT_PATH="/opt/homebrew/opt/fftw"
115109
fi
116-
export PATH="$QTDIR/bin:$PATH"
117110
qmake "FFT_LIBDIR=$FFT_PATH" fmit.pro
118111
119112
- name: Configure (Windows)
@@ -131,7 +124,6 @@ jobs:
131124
- name: Build (macOS)
132125
if: matrix.platform == 'macos'
133126
run: |
134-
export PATH="$QTDIR/bin:$PATH"
135127
make -j$(sysctl -n hw.ncpu)
136128
make lrelease
137129
@@ -155,7 +147,6 @@ jobs:
155147
- name: Package .dmg (macOS)
156148
if: matrix.platform == 'macos'
157149
run: |
158-
export PATH="$QTDIR/bin:$PATH"
159150
macdeployqt fmit.app -dmg
160151
mv fmit.dmg "fmit_${GITVERSION}.dmg"
161152
ls -l "fmit_${GITVERSION}.dmg"

fmit.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ win32 {
136136
gcc: LIBS += -glu32
137137
}
138138

139-
QT += core gui opengl openglwidgets multimedia svg
139+
QT += core gui opengl multimedia svg
140140
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
141141
macx: QT += network
142142

0 commit comments

Comments
 (0)