Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Ghostkeeper 2016-05-27 14:09:38 +02:00
commit 8bd06ee8ec
10 changed files with 130 additions and 87 deletions

View file

@ -321,6 +321,7 @@ class CuraApplication(QtApplication):
MachineManagerModel.createMachineManagerModel)
self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml"))
self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
self.initializeEngine()
if self._engine.rootObjects: