diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 12:47:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 12:47:05 +0200 |
| commit | 73d0fe549b223aa16544d04754a3301f4640f6d6 (patch) | |
| tree | c6f0ad1b372b7ff818b282335415f8ce737b39bd /sources/pyside2/PySide2/__init__.py.in | |
| parent | 5c3002ebae8e31b3aa05a43e418b196653b041d6 (diff) | |
| parent | f2e63d3588c8422d84d9ff5480427a83d68083bb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6cf604e1ae7234ce4f0d99169e9269a7dde07a4a
Diffstat (limited to 'sources/pyside2/PySide2/__init__.py.in')
| -rw-r--r-- | sources/pyside2/PySide2/__init__.py.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index 8013ac68a..f860c6ac9 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -12,6 +12,9 @@ __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @B def _additional_dll_directories(package_dir): # Find shiboken2 relative to the package directory. root = os.path.dirname(package_dir) + # Check for a flat .zip as deployed by cx_free(PYSIDE-1257) + if root.endswith('.zip'): + return [] shiboken2 = os.path.join(root, 'shiboken2') if os.path.isdir(shiboken2): # Standard case, only shiboken2 is needed return [shiboken2] |