diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-11-21 11:41:29 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-11-27 09:39:12 +0100 |
| commit | 05b3c28099c1eaff74bba8b06004cc8205b24f45 (patch) | |
| tree | 847fec32bee0be83ce2b5cd402b0353dfc39e554 /sources/pyside-tools | |
| parent | 356aad62fd43f077b325b18ed890b7713c458e9f (diff) | |
Desktop Deployment: Upgrade Nuitka to 2.5.1
- Nuitka 2.5.1 imposes strict checking for the Qt plugins included
through the --include-qt-plugins option by checking if the plugin
actually exists in PySide6 installation. Consequently, the plugins
"accessiblebridge", and "platforms/darwin" which are not required
by Nuitka are removed from the list of plugins to be included.
- Adapt tests.
Pick-to: 6.8
Task-number: PYSIDE-1612
Change-Id: I89cef4acf102e01c229b1dd6063fc08903ea686d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside-tools')
| -rw-r--r-- | sources/pyside-tools/deploy_lib/default.spec | 2 | ||||
| -rw-r--r-- | sources/pyside-tools/deploy_lib/nuitka_helper.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sources/pyside-tools/deploy_lib/default.spec b/sources/pyside-tools/deploy_lib/default.spec index a4c2315a0..0760758d8 100644 --- a/sources/pyside-tools/deploy_lib/default.spec +++ b/sources/pyside-tools/deploy_lib/default.spec @@ -25,7 +25,7 @@ icon = python_path = # python packages to install -packages = Nuitka==2.4.8 +packages = Nuitka==2.5.1 # buildozer: for deploying Android application android_packages = buildozer==1.5.0,cython==0.29.33 diff --git a/sources/pyside-tools/deploy_lib/nuitka_helper.py b/sources/pyside-tools/deploy_lib/nuitka_helper.py index 4b59bed73..6ccc97da3 100644 --- a/sources/pyside-tools/deploy_lib/nuitka_helper.py +++ b/sources/pyside-tools/deploy_lib/nuitka_helper.py @@ -166,6 +166,13 @@ class Nuitka: if qt_plugins: # sort qt_plugins so that the result is definitive when testing qt_plugins.sort() + # remove the following plugins from the qt_plugins list as Nuitka only checks + # for plugins within PySide6/Qt/plugins folder, and the following plugins + # are not present in the PySide6/Qt/plugins folder + if "accessiblebridge" in qt_plugins: + qt_plugins.remove("accessiblebridge") + if "platforms/darwin" in qt_plugins: + qt_plugins.remove("platforms/darwin") qt_plugins_str = ",".join(qt_plugins) command.append(f"--include-qt-plugins={qt_plugins_str}") |