diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-20 13:38:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-21 14:30:39 +0200 |
| commit | 3fb8c260142c1bc928de40a6d063dd91bba33b8d (patch) | |
| tree | 7bba8d6c526c591c70f36389437e92b277507cea /build_scripts | |
| parent | fa38984e53a7a325fd317822f75551379763b810 (diff) | |
build system: Fix standalone build with --no-qt-tools
Patch the binaries only when tools are enabled.
Fixes: PYSIDE-2060
Pick-to: 6.3
Change-Id: I75b2949e23a2d6cbfebcd64dfec7ab43e978881c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/platforms/linux.py | 3 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 700265dad..2c3d48fcb 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -4,6 +4,7 @@ import os from ..config import config +from ..options import OPTION from ..utils import (copy_icu_libs, copydir, copyfile, find_files_using_glob, linux_patch_executable) from ..versions import PYSIDE @@ -59,7 +60,7 @@ def prepare_standalone_package_linux(self, _vars): self.update_rpath_for_linux_qt_libraries(destination_lib_dir.format(**_vars)) # Patching designer to use the Qt libraries provided in the wheel - if config.is_internal_pyside_build(): + if config.is_internal_pyside_build() and not OPTION['NO_QT_TOOLS']: assistant_path = "{st_build_dir}/{st_package_name}/assistant".format(**_vars) linux_patch_executable(self._patchelf_path, assistant_path) designer_path = "{st_build_dir}/{st_package_name}/designer".format(**_vars) diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 6b8d5e1f8..5ae27103e 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -5,6 +5,7 @@ import fnmatch import os from ..config import config +from ..options import OPTION from ..utils import (copydir, copyfile, macos_add_rpath, macos_fix_rpaths_for_library) from ..versions import PYSIDE @@ -54,7 +55,7 @@ def prepare_standalone_package_macos(self, _vars): return True # Patching designer to use the Qt libraries provided in the wheel - if config.is_internal_pyside_build(): + if config.is_internal_pyside_build() and not OPTION['NO_QT_TOOLS']: _macos_patch_executable('assistant', _vars) _macos_patch_executable('designer', _vars) _macos_patch_executable('linguist', _vars) |