Skip to content

Commit

Permalink
Qt 6.4 on OSX and Qt 6.5 on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Simon committed Dec 5, 2023
1 parent 0351d0a commit a810c35
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
- Visual Studio 2022
build_script:
- cmd: C:\Python311-x64\python -u build.py
- sh: $HOME/venv3.10/bin/python build.py
- sh: $HOME/venv3.11/bin/python build.py
artifacts:
- path: 'Lenlab-*-linux-x86_64.AppImage'
- path: 'Lenlab-*-mac.dmg'
Expand Down
7 changes: 4 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def build_osx(tag: str):
print_versions("Qt", Path.home() / "Qt")
print_versions("Python", Path.home(), "venv*")

qmake = Path.home() / "Qt/6.2/macos/bin/qmake"
macdeployqt = Path.home() / "Qt/6.2/macos/bin/macdeployqt"
qmake = Path.home() / "Qt/6.4/macos/bin/qmake"
macdeployqt = Path.home() / "Qt/6.4/macos/bin/macdeployqt"
print_qt_version(qmake)

print_header("build")
Expand Down Expand Up @@ -151,11 +151,12 @@ def build_osx(tag: str):

def build_windows(tag: str):
print_versions("Qt", Path(r"C:\Qt"))
print_versions("Qt Tools", Path(r"C:\Qt\Tools"))
print_versions("Python", Path(r"C:"), "Python*")

env = dict(os.environ)

qmake = Path(r"C:\Qt\6.4.0\mingw_64\bin\qmake.exe")
qmake = Path(r"C:\Qt\6.5.3\mingw_64\bin\qmake.exe")
make = Path(r"C:\Qt\Tools\mingw1120_64\bin\mingw32-make.exe")
env["PATH"] = f"{qmake.parent};{make.parent};{env['PATH']}"
windeployqt = qmake.parent / "windeployqt.exe"
Expand Down

0 comments on commit a810c35

Please sign in to comment.