From 6f5fabeb0efd9af182760f982e0087e75e9a2469 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Fri, 3 Feb 2023 10:16:39 +0100 Subject: [PATCH] Add qtconnectivity to fix windeploqt and macdeployqt For some reason scene2d.dll need Qt6Bluetooth. What even is scene2d? --- Tools/build.py | 2 +- Tools/setup.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/build.py b/Tools/build.py index 2ac9efb4..36dd3b23 100755 --- a/Tools/build.py +++ b/Tools/build.py @@ -157,7 +157,7 @@ def setup(build_config: BuildConfig, build_result: BuildResult) -> Tuple[BuildCo print(f"Using env_dict:\n{env_dict}") os.environ.update(env_dict) # 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_tool_packages = "windows desktop tools_ifw" diff --git a/Tools/setup.py b/Tools/setup.py index 54634e26..607f8916 100755 --- a/Tools/setup.py +++ b/Tools/setup.py @@ -50,13 +50,13 @@ def download(aqt_path: Path, qt_platform: Path): elif system() == "Linux": os = "linux" - # aqt list-qt windows desktop --modules 6.3.2 win64_msvc2019_64 - qt_packages = "qt3d qtquick3d qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning" + # python -m aqt list-qt windows desktop --modules 6.5.0 win64_msvc2019_64 + qt_packages = "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning" 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}") # 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"] for tool in tools: execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-tool -O {aqt_path} {os} desktop {tool}")