aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-03-23 14:55:12 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-03-23 16:13:57 +0100
commita492836fb07af9f1aad0fffb7b560752daaa82ae (patch)
tree93389e321e8333901d11a6779023df55033fe305
parent45002cd9d60b03045584d5dc210e8499ec11a996 (diff)
Windows: Enable building without QML
Test for existence of libpysideqml in __init__.py. Amends 8019ce52080ed51cd053d480c6c61d667469fc25. Task-number: PYSIDE-1709 Change-Id: Iaf4c05a321ced69c91a7d92d711ae6acd5a621fd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside6/PySide6/__init__.py.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/__init__.py.in b/sources/pyside6/PySide6/__init__.py.in
index 70516f622..2631c346c 100644
--- a/sources/pyside6/PySide6/__init__.py.in
+++ b/sources/pyside6/PySide6/__init__.py.in
@@ -24,7 +24,10 @@ def _additional_dll_directories(package_dir):
shiboken6 = Path(root).parent / 'shiboken6' / 'libshiboken'
if not shiboken6.is_dir():
raise ImportError(str(shiboken6) + ' does not exist')
- result = [shiboken6, root / 'libpyside', root / 'libpysideqml']
+ result = [shiboken6, root / 'libpyside']
+ libpysideqml = root / 'libpysideqml'
+ if libpysideqml.is_dir():
+ result.append(libpysideqml)
for path in os.environ.get('PATH').split(';'):
if path:
if (Path(path) / 'qmake.exe').exists():