Merge remote-tracking branch 'origin/master' into libArachne_rebased

This commit is contained in:
Jelle Spijker 2021-02-05 08:48:57 +01:00
commit 55e3b858d6
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
207 changed files with 3493 additions and 183 deletions

View file

@ -228,6 +228,12 @@ if Platform.isLinux() and getattr(sys, "frozen", False):
import trimesh.exchange.load
os.environ["LD_LIBRARY_PATH"] = old_env
# WORKAROUND: Cura#5488
# When using the KDE qqc2-desktop-style, the UI layout is completely broken, and
# even worse, it crashes when switching to the "Preview" pane.
if Platform.isLinux():
os.environ["QT_QUICK_CONTROLS_STYLE"] = "default"
if ApplicationMetadata.CuraDebugMode:
ssl_conf = QSslConfiguration.defaultConfiguration()
ssl_conf.setPeerVerifyMode(QSslSocket.VerifyNone)