diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2021-06-16 19:04:54 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2021-06-16 19:04:54 +0300 |
| commit | 611208368ca5ab40d91453a7084938429bce7dab (patch) | |
| tree | d4e5df410abe5ada3fbdbde919ca8e5115006192 /cura_app.py | |
| parent | d788bab150657c54f9a6cd238c52a4352237e813 (diff) | |
| parent | 92ff9ac31367dece80c40700e4cbf585e19dd421 (diff) | |
Merge branch 'master' into libArachne_rebased
Conflicts:
cura/CuraApplication.py: Setting version
fdmprinter and fdmextruder: Setting version
intents, qualities and variants: Setting version
Changelog: 4.9.1 was added, should be below Arachne changes
Diffstat (limited to 'cura_app.py')
| -rwxr-xr-x | cura_app.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cura_app.py b/cura_app.py index 0445f896ae..b9a42f0aba 100755 --- a/cura_app.py +++ b/cura_app.py @@ -16,14 +16,6 @@ import argparse import faulthandler import os -# Workaround for a race condition on certain systems where there -# is a race condition between Arcus and PyQt. Importing Arcus -# first seems to prevent Sip from going into a state where it -# tries to create PyQt objects on a non-main thread. -import Arcus # @UnusedImport -import Savitar # @UnusedImport -import pynest2d # @UnusedImport - from PyQt5.QtNetwork import QSslConfiguration, QSslSocket from UM.Platform import Platform |