Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth

This commit is contained in:
Lipu Fei 2018-09-28 14:32:16 +02:00
commit 8584af415a
4 changed files with 21 additions and 24 deletions

View file

@ -682,7 +682,7 @@ class CuraApplication(QtApplication):
Logger.log("i", "Initializing quality manager")
from cura.Machines.QualityManager import QualityManager
self._quality_manager = QualityManager(container_registry, parent = self)
self._quality_manager = QualityManager(self, parent = self)
self._quality_manager.initialize()
Logger.log("i", "Initializing machine manager")