diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
| commit | c7d7dd11d143c804d0c1b3ff67fc6f89ed5171e6 (patch) | |
| tree | db5f78d4f88e85e01c408c03d3298c95cd14ebb9 /cura_app.py | |
| parent | 28924a1c87032e29306d0fca067bb39abc2accf2 (diff) | |
| parent | 614fe6fd4f0b6370b731c11d3cf5395f788b9ad4 (diff) | |
Merge branch 'master' into PyQt6_upgrade
Conflicts:
cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
Diffstat (limited to 'cura_app.py')
| -rwxr-xr-x | cura_app.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cura_app.py b/cura_app.py index da8b3bc18d..e11e3c4232 100755 --- a/cura_app.py +++ b/cura_app.py @@ -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 PyQt6.QtNetwork import QSslConfiguration, QSslSocket |