diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-09-01 16:13:35 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-09-08 19:17:25 +0200 |
| commit | 7f4245a4cf3cdad151f0f6677fe92cbef3bb9be5 (patch) | |
| tree | 963f432bdd2dd828f3ac532f311ab6b5f692fcad /sources/pyside-tools/android_deploy.py | |
| parent | b6abfbedef444ab15f5340c5edfef7acfa06dc7f (diff) | |
Android Deployment: Load required PySide6 modules on startup
- This is required for having callbacks from C++/CPython back to Python.
One example of this is when shiboken class="native" methods are called
. There are also other cases where we call back to a Python callable
through a callback from the wrapper code generated by Shiboken.
- The identified Qt modules are loaded by the python-for-android
recipe for PySide6.
Task-number: PYSIDE-1612
Change-Id: I5881ac2351fc0afb87367b4149f0f668ac1a8d37
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside-tools/android_deploy.py')
| -rw-r--r-- | sources/pyside-tools/android_deploy.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sources/pyside-tools/android_deploy.py b/sources/pyside-tools/android_deploy.py index 97ac523b4..f10834c12 100644 --- a/sources/pyside-tools/android_deploy.py +++ b/sources/pyside-tools/android_deploy.py @@ -117,6 +117,15 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non config.title = name try: + # check which modules are needed + if not config.modules: + config.modules = find_pyside_modules(project_dir=config.project_dir, + extra_ignore_dirs=extra_ignore_dirs, + project_data=config.project_data) + logging.info("The following PySide modules were found from the python files of " + f"the project {config.modules}") + config.modules.extend(extra_modules) + # create recipes # https://python-for-android.readthedocs.io/en/latest/recipes/ # These recipes are manually added through buildozer.spec file to be used by @@ -126,7 +135,8 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non version = Wheel(config.wheel_pyside).version create_recipe(version=version, component=f"PySide{MAJOR_VERSION}", wheel_path=config.wheel_pyside, - generated_files_path=generated_files_path) + generated_files_path=generated_files_path, + qt_modules=config.modules) create_recipe(version=version, component=f"shiboken{MAJOR_VERSION}", wheel_path=config.wheel_shiboken, generated_files_path=generated_files_path) @@ -140,18 +150,6 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non generated_files_path=generated_files_path) config.jars_dir = (generated_files_path / "jar" / "PySide6" / "jar").resolve() - # check which modules are needed - # TODO: Optimize this based on the modules needed - # check if other modules not supported by Android used and raise error - if not config.modules: - config.modules = find_pyside_modules(project_dir=config.project_dir, - extra_ignore_dirs=extra_ignore_dirs, - project_data=config.project_data) - logging.info("The following PySide modules were found from the python files of " - f"the project {config.modules}") - - config.modules.extend(extra_modules) - # find architecture from wheel name if not config.arch: arch = get_wheel_android_arch(wheel=config.wheel_pyside) |