From f730959f780ef6d69733dc69d2f9a1dfbe802af3 Mon Sep 17 00:00:00 2001
From: jelle Spijker <j.spijker@ultimaker.com>
Date: Mon, 30 Aug 2021 16:15:02 +0200
Subject: [PATCH] fixed discard or keep combobox on Mac

Use the new controls ComboBox
---
 resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index 2ddacb6d79..0a9d317d2d 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -3,6 +3,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.1
+import QtQuick.Controls 2.15 as NewControls
 import QtQuick.Dialogs 1.2
 import QtQuick.Window 2.1
 
@@ -145,10 +146,11 @@ UM.Dialog
         anchors.margins: UM.Theme.getSize("default_margin").width
         height: childrenRect.height
 
-        ComboBox
+        NewControls.ComboBox
         {
             id: discardOrKeepProfileChangesDropDownButton
             width: 300
+            textRole: "text"
 
             model: ListModel
             {
@@ -217,4 +219,4 @@ UM.Dialog
             }
         }
     }
-}
\ No newline at end of file
+}