diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-01 14:17:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-06 06:45:37 +0000 |
| commit | 401c8134dd84e3ad271c6a0a1e6248cf090d7fe4 (patch) | |
| tree | ce2a2ad39d9f4cbe077059325f85b3794c164945 /build_scripts/platforms/macos.py | |
| parent | 9daa6fd5497226733d74490c03990e8d5a88d8d2 (diff) | |
Pyside6/Qt Designer: Fix Python code preview not working on UNIX
Qt Designer as bundled by PySide6 was unable to find the uic
binary in the libexec directory of the bundled Qt since that was only
copied when QtWebEngine was built and the rcc/uic binaries were copied
into the main directory.
Also, libexec existed as a file containing qt.conf, which was created
by a copy statement not checking for the target directory.
Fix that by actually creating a libexec directory for uic, rcc and
QtWebEngineProcess. Patch the executables accordingly.
Add checks before copying qt.conf.
Adapt pyside-tool to use libexec.
The Windows code path remains the same, everything uses
main directory there.
Change-Id: I0c9f46fb776ed0315eecb6ed00202ea8d8f17fe2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts/platforms/macos.py')
| -rw-r--r-- | build_scripts/platforms/macos.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 81e826d73..dcbaff3a3 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -160,12 +160,6 @@ def prepare_standalone_package_macos(self, vars): recursive=True, vars=vars, force_copy_symlinks=True) if self.is_webengine_built(built_modules): - copydir("{qt_lib_execs_dir}", - "{st_build_dir}/{st_package_name}/Qt/libexec", - filter=None, - recursive=False, - vars=vars) - copydir("{qt_prefix_dir}/resources", "{st_build_dir}/{st_package_name}/Qt/resources", filter=None, @@ -181,10 +175,11 @@ def prepare_standalone_package_macos(self, vars): if copy_qt_conf: # Copy the qt.conf file to libexec. + if not os.path.isdir(qt_libexec_path): + os.makedirs(qt_libexec_path) copyfile( f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/qt.conf", - "{st_build_dir}/{st_package_name}/Qt/libexec", - vars=vars) + qt_libexec_path, vars=vars) if copy_plugins: # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins |