summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-06-07 13:51:59 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-06-07 12:13:04 +0000
commit604827427b03226742817c0c38e0c3b8ad3d7f2c (patch)
tree51eccaef33dcef2805551efbb65368d640de7506
parent823eea34b77ca16a545a75b55619a5ed4da38c0e (diff)
Fix openssl lib path not being properly set on Windows
This lead to failure of importing PySide2, because on Windows __init__.py tried to load QtNetwork and that failed because it could't find the ssl libraries. This is a regression and amend of 87e85c460 . Task-number: PYSIDE-687 Change-Id: I298153b054baf5fa85b1831d88a99480c5c0a249 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--sources/pyside2/PySide2/__init__.py.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index f33b05e3..19425c34 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -24,7 +24,7 @@ def _setupQtDirectories():
# PATH has to contain the package directory, otherwise plugins
# won't be able to find their required Qt libraries (e.g. the
# svg image plugin won't find Qt5Svg.dll).
- os.environ['PATH'] = pyside_package_dir + ";" + os.environ['PATH']
+ os.environ['PATH'] = pyside_package_dir + os.pathsep + os.environ['PATH']
# On Windows add the PySide2\openssl folder (if it exists) to
# the PATH so that the SSL DLLs can be found when Qt tries to
@@ -34,7 +34,7 @@ def _setupQtDirectories():
if os.path.exists(openssl_dir):
path = os.environ['PATH']
try:
- os.environ['PATH'] = os.path.join(openssl_dir, path)
+ os.environ['PATH'] = openssl_dir + os.pathsep + path
try:
from . import QtNetwork
except ImportError: