build scripts: use proper variable name instead of self

- Remnants of 6fe563b2aa15c2c23369acce353be69f6ea84c77

Pick-to: 6.4 6.3
Change-Id: I664b960324d49db08f7a8ec6cf5244fbcda970d0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py
index ffb2070b7..a6423e1c1 100644
--- a/build_scripts/platforms/macos.py
+++ b/build_scripts/platforms/macos.py
@@ -21,7 +21,7 @@ def _macos_patch_executable(name, _vars=None):
     macos_add_rpath(rpath, binary)
 
 
-def prepare_standalone_package_macos(self, _vars):
+def prepare_standalone_package_macos(pyside_build, _vars):
     built_modules = _vars['built_modules']
 
     constrain_modules = None
@@ -49,7 +49,7 @@ def prepare_standalone_package_macos(self, _vars):
     no_copy_debug = True
 
     def file_variant_filter(file_name, file_full_path):
-        if self.qtinfo.build_type != 'debug_and_release':
+        if pyside_build.qtinfo.build_type != 'debug_and_release':
             return True
         if file_name.endswith('_debug.dylib') and no_copy_debug:
             return False
@@ -62,11 +62,11 @@ def prepare_standalone_package_macos(self, _vars):
         _macos_patch_executable('linguist', _vars)
 
     # <qt>/lib/* -> <setup>/{st_package_name}/Qt/lib
-    if self.qt_is_framework_build():
+    if pyside_build.qt_is_framework_build():
         def framework_dir_filter(dir_name, parent_full_path, dir_full_path):
             if '.framework' in dir_name:
                 if (dir_name.startswith('QtWebEngine')
-                        and not self.is_webengine_built(built_modules)):
+                        and not pyside_build.is_webengine_built(built_modules)):
                     return False
                 if constrain_modules and dir_name not in constrain_frameworks:
                     return False
@@ -86,7 +86,7 @@ def prepare_standalone_package_macos(self, _vars):
         no_copy_debug = True
 
         def framework_variant_filter(file_name, file_full_path):
-            if self.qtinfo.build_type != 'debug_and_release':
+            if pyside_build.qtinfo.build_type != 'debug_and_release':
                 return True
             dir_path = Path(file_full_path).parent
             in_framework = dir_path.endswith("Versions/5")
@@ -104,7 +104,7 @@ def prepare_standalone_package_macos(self, _vars):
         # present rpath does not work because it assumes a symlink
         # from Versions/5/Helpers, thus adding two more levels of
         # directory hierarchy.
-        if self.is_webengine_built(built_modules):
+        if pyside_build.is_webengine_built(built_modules):
             qt_lib_path = Path("{st_build_dir}/{st_package_name}/Qt/lib".format(**_vars))
             bundle = Path("QtWebEngineCore.framework/Helpers/") / "QtWebEngineProcess.app"
             binary = "Contents/MacOS/QtWebEngineProcess"
@@ -114,7 +114,7 @@ def prepare_standalone_package_macos(self, _vars):
             macos_fix_rpaths_for_library(final_path, rpath)
     else:
         ignored_modules = []
-        if not self.is_webengine_built(built_modules):
+        if not pyside_build.is_webengine_built(built_modules):
             ignored_modules.extend(['libQt6WebEngine*.dylib'])
         accepted_modules = ['libQt6*.6.dylib']
         if constrain_modules:
@@ -127,7 +127,7 @@ def prepare_standalone_package_macos(self, _vars):
                 file_filter_function=file_variant_filter,
                 recursive=True, _vars=_vars, force_copy_symlinks=True)
 
-        if self.is_webengine_built(built_modules):
+        if pyside_build.is_webengine_built(built_modules):
             copydir("{qt_data_dir}/resources",
                     "{st_build_dir}/{st_package_name}/Qt/resources",
                     _filter=None,
@@ -150,7 +150,7 @@ def prepare_standalone_package_macos(self, _vars):
                     qt_libexec_path, _vars=_vars)
 
     if copy_plugins:
-        is_pypy = "pypy" in self.build_classifiers
+        is_pypy = "pypy" in pyside_build.build_classifiers
         # <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins
         plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins"
         filters = ["*.dylib"]