Merge branch '4.13'

This commit is contained in:
Ghostkeeper 2022-01-11 14:12:04 +01:00
commit 66648ca611
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 6 additions and 2 deletions

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3
# Copyright (c) 2020 Ultimaker B.V.
# Copyright (c) 2022 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
# Remove the working directory from sys.path.
@ -15,6 +15,9 @@ if "" in sys.path:
import argparse
import faulthandler
import os
if sys.platform != "linux": # Turns out the Linux build _does_ use this, but we're not making an Enterprise release for that system anyway.
os.environ["QT_PLUGIN_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
os.environ["QML2_IMPORT_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
from PyQt5.QtNetwork import QSslConfiguration, QSslSocket