Fix qml warnings

CURA-2006
This commit is contained in:
fieldOfView 2016-08-22 19:25:42 +02:00
parent 08091209f1
commit 0f998c6e2e
2 changed files with 4 additions and 4 deletions

View File

@ -54,9 +54,9 @@ Tab
model: Cura.QualitySettingsModel
{
extruderId: base.extruderId != "" ? base.extruderId : null;
quality: base.quality != null ? base.quality : "";
material: base.material
extruderId: base.extruderId != "" ? base.extruderId : ""
quality: base.quality != null ? base.quality : ""
material: base.material != null ? base.material : ""
}
}
}

View File

@ -201,7 +201,7 @@ UM.ManagementPage
{
title: catalog.i18nc("@title:tab", "Global Settings");
quality: base.currentItem != null ? base.currentItem.id : "";
material: Cura.MachineManager.allActiveMaterialIds.global
material: Cura.MachineManager.allActiveMaterialIds.global ? Cura.MachineManager.allActiveMaterialIds.global : ""
}
Repeater