Skip to content

Commit 9b94415

Browse files
committed
Build with Qt6
1 parent d794349 commit 9b94415

5 files changed

Lines changed: 12 additions & 17 deletions

File tree

.appveyor.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ os: Visual Studio 2022
22

33
environment:
44
matrix:
5-
- arch: x86
6-
compiler: msvc2019
75
- arch: x64
86
compiler: msvc2019
97

@@ -12,8 +10,8 @@ platform:
1210

1311
install:
1412
# Set paths to dependencies (based on architecture)
15-
- cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python312) else (set PYTHON_ROOT=C:\python312-x64)
16-
- cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.15\%compiler%) else (set QT_ROOT=C:\Qt\5.15\%compiler%_64)
13+
- cmd: set PYTHON_ROOT=C:\python312-x64
14+
- cmd: set QT_ROOT=C:\Qt\6.5\%compiler%_64
1715
# Print out dependency paths
1816
- cmd: echo Using Python at %PYTHON_ROOT%
1917
- cmd: echo Using Qt at %QT_ROOT%
@@ -31,7 +29,7 @@ build_script:
3129

3230
after_build:
3331
# Zip build binaries and dependencies
34-
- cmd: 7z a libopenrazer_%compiler%_%arch%.zip %APPVEYOR_BUILD_FOLDER%\builddir\libopenrazerdemo.exe %QT_ROOT%\bin\Qt5Core.dll %QT_ROOT%\bin\Qt5DBus.dll %QT_ROOT%\bin\Qt5Xml.dll
32+
- cmd: 7z a libopenrazer_%compiler%_%arch%.zip %APPVEYOR_BUILD_FOLDER%\builddir\libopenrazerdemo.exe %QT_ROOT%\bin\Qt6Core.dll %QT_ROOT%\bin\Qt6DBus.dll %QT_ROOT%\bin\Qt6Xml.dll
3533

3634
artifacts:
3735
- path: libopenrazer*.zip

.builds/alpine.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
image: alpine/edge
22
packages:
33
- meson
4-
- qt5-qtbase-dev
5-
- qt5-qttools-dev
4+
- qt6-qtbase-dev
5+
- qt6-qttools-dev
66
sources:
77
- https://github.com/z3ntu/libopenrazer
88
tasks:

.builds/freebsd.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ image: freebsd/latest
22
packages:
33
- meson
44
- pkgconf
5-
- qt5-buildtools
6-
- qt5-dbus
7-
- qt5-linguisttools
8-
- qt5-widgets
9-
- qt5-xml
5+
- qt6-base
6+
- qt6-tools
107
sources:
118
- https://github.com/z3ntu/libopenrazer
129
tasks:

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- uses: actions/setup-python@v5
99
with:
1010
python-version: '3.x'
11-
- run: brew install qt@5 meson
12-
- run: echo "/opt/homebrew/opt/qt@5/bin" >> $GITHUB_PATH
11+
- run: brew install qt@6 meson
12+
- run: echo "/opt/homebrew/opt/qt@6/bin" >> $GITHUB_PATH
1313
- run: meson setup builddir
1414
- run: meson compile -C builddir

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
project('libopenrazer',
22
'cpp',
33
version : '0.3.0',
4-
default_options : ['cpp_std=c++11'])
4+
default_options : ['cpp_std=c++17'])
55

6-
qt = import('qt5')
7-
qt_dep = dependency('qt5', modules : ['Core', 'DBus', 'Gui', 'Xml'])
6+
qt = import('qt6')
7+
qt_dep = dependency('qt6', modules : ['Core', 'DBus', 'Gui', 'Xml'])
88

99
if build_machine.system() == 'darwin'
1010
libopenrazer_data_dir = 'Contents/Resources'

0 commit comments

Comments
 (0)