Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 18:52:30 +01:00
Code Issues Projects Releases Activity

Fix macOS qt 6.4.1 broken QWebEngine

Browse Source 
Lets use 6.3.2 for now until
https://bugreports.qt.io/browse/QTBUG-96406
is fixed
This commit is contained in:
Elias Steurer 2022-12-17 13:29:31 +01:00
parent 3042de6d3b
commit e0e02cfcde
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakePresets.json
View File

@ -79,7 +79,7 @@
"displayName": "ScreenPlay 64bit Debug osx", "displayName": "ScreenPlay 64bit Debug osx",
"description": "Osx only!", "description": "Osx only!",
"generator": "Ninja", "generator": "Ninja",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6_4_1_GCC", "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6_3_2_GCC",
"condition": { "condition": {
"type": "equals", "type": "equals",
"lhs": "${hostSystemName}", "lhs": "${hostSystemName}",
@ -96,7 +96,7 @@
"CMAKE_CXX_COMPILER": "clang++", "CMAKE_CXX_COMPILER": "clang++",
"CMAKE_C_COMPILER": "clang", "CMAKE_C_COMPILER": "clang",
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{aqt_path}/6.4.1/macos", "CMAKE_PREFIX_PATH": "$env{aqt_path}/6.3.2/macos",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake" "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
} }
} }

2
Tools/defines.py
View File

@ -5,7 +5,7 @@ from sys import stdout
stdout.reconfigure(encoding='utf-8') stdout.reconfigure(encoding='utf-8')
VCPKG_VERSION = "2871ddd" # Master 11.11.2022 VCPKG_VERSION = "2871ddd" # Master 11.11.2022
QT_VERSION = "6.4.1" QT_VERSION = "6.4.1" if sys.platform != "darwin" else "6.3.2"
QT_IFW_VERSION = "4.5" QT_IFW_VERSION = "4.5"
SCREENPLAY_VERSION = "0.15.0-RC3" SCREENPLAY_VERSION = "0.15.0-RC3"
AQT_PATH = Path.cwd().parent.parent.joinpath("aqt") AQT_PATH = Path.cwd().parent.parent.joinpath("aqt")