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

Add qtconnectivity to fix windeploqt and macdeployqt

Browse Source 
For some reason scene2d.dll need Qt6Bluetooth. What even is scene2d?
This commit is contained in:
Elias Steurer 2023-02-03 10:16:39 +01:00
parent bd4c7e0bcf
commit 6f5fabeb0e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/build.py
View File

@ -157,7 +157,7 @@ def setup(build_config: BuildConfig, build_result: BuildResult) -> Tuple[BuildCo
print(f"Using env_dict:\n{env_dict}") print(f"Using env_dict:\n{env_dict}")
os.environ.update(env_dict) os.environ.update(env_dict)
# NO f string we fill it later! # NO f string we fill it later!
build_config.package_command = "windeployqt.exe --{type} --qmldir ../../{app}/qml {app}{executable_file_ending}" build_config.package_command = "windeployqt6.exe --{type} --qmldir ../../{app}/qml {app}{executable_file_ending}"
build_config.aqt_install_qt_packages = f"windows desktop {build_config.qt_version} win64_msvc2019_64 -m all" build_config.aqt_install_qt_packages = f"windows desktop {build_config.qt_version} win64_msvc2019_64 -m all"
build_config.aqt_install_tool_packages = "windows desktop tools_ifw" build_config.aqt_install_tool_packages = "windows desktop tools_ifw"

6
Tools/setup.py
View File

@ -50,13 +50,13 @@ def download(aqt_path: Path, qt_platform: Path):
elif system() == "Linux": elif system() == "Linux":
os = "linux" os = "linux"
# aqt list-qt windows desktop --modules 6.3.2 win64_msvc2019_64 # python -m aqt list-qt windows desktop --modules 6.5.0 win64_msvc2019_64
qt_packages = "qt3d qtquick3d qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning" qt_packages = "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
print(f"Downloading: {qt_packages} to {aqt_path}") print(f"Downloading: {qt_packages} to {aqt_path}")
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}") execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")
# Tools can only be installed one at the time: # Tools can only be installed one at the time:
# see: aqt list-tool windows desktop # see: python -m aqt list-tool windows desktop
tools = ["tools_ifw", "tools_qtcreator", "tools_ninja" ,"tools_cmake"] tools = ["tools_ifw", "tools_qtcreator", "tools_ninja" ,"tools_cmake"]
for tool in tools: for tool in tools:
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-tool -O {aqt_path} {os} desktop {tool}") execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-tool -O {aqt_path} {os} desktop {tool}")