From 0f998c6e2e369d91abee25540c418efe9e84fad9 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 22 Aug 2016 19:25:42 +0200
Subject: [PATCH] Fix qml warnings

CURA-2006
---
 resources/qml/Preferences/ProfileTab.qml   | 6 +++---
 resources/qml/Preferences/ProfilesPage.qml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/qml/Preferences/ProfileTab.qml b/resources/qml/Preferences/ProfileTab.qml
index 6733c0df2e..90a04ee1e4 100644
--- a/resources/qml/Preferences/ProfileTab.qml
+++ b/resources/qml/Preferences/ProfileTab.qml
@@ -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 : ""
         }
     }
 }
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 86ac75abf8..6eebefa3d5 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -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