Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1

This commit is contained in:
Ghostkeeper 2019-04-26 14:15:07 +02:00
commit 1fb336ed3d
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
5 changed files with 190 additions and 105 deletions

View file

@ -217,7 +217,7 @@ class CuraApplication(QtApplication):
self._machine_settings_manager = MachineSettingsManager(self, parent = self)
self._discovered_printer_model = DiscoveredPrintersModel(parent = self)
self._discovered_printer_model = DiscoveredPrintersModel(self, parent = self)
self._first_start_machine_actions_model = FirstStartMachineActionsModel(self, parent = self)
self._welcome_pages_model = WelcomePagesModel(self, parent = self)
self._add_printer_pages_model = AddPrinterPagesModel(self, parent = self)