diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-20 13:38:05 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-21 13:45:54 +0000 |
| commit | 6bc801c6a51915a7f1d4d0cefe64034121d0beab (patch) | |
| tree | 057faf0d2671cb71f3278d84643661fef7cf82ab | |
| parent | 0fcb6ce41ddb2b3fcb4aa1a25f179e3e338f4805 (diff) | |
build system: Fix standalone build with --no-qt-tools
Patch the binaries only when tools are enabled.
Fixes: PYSIDE-2060
Change-Id: I75b2949e23a2d6cbfebcd64dfec7ab43e978881c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 3fb8c260142c1bc928de40a6d063dd91bba33b8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 229d4397d..b0c025bc8 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -40,6 +40,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 @@ -95,7 +96,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 69c2a436c..07a565f35 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -41,6 +41,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 @@ -90,7 +91,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) |