From d2007901f72c02cb74a129d36c51d9bba46edc8f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 7 Apr 2021 08:31:49 +0200 Subject: [PATCH] Also convert visibility-preset dropdown. This will make this Qt5.15 control work on mac again. (Since the older controls are deprecated.) CURA-8127 --- resources/qml/Preferences/SettingVisibilityPage.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index eda40af0b1..a1d5368e30 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -5,6 +5,8 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 +import QtQuick.Controls 2.3 as NewControls + import UM 1.2 as UM import Cura 1.0 as Cura @@ -96,7 +98,7 @@ UM.PreferencesPage onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text} } - ComboBox + NewControls.ComboBox { id: visibilityPreset width: 150 * screenScaleFactor @@ -104,6 +106,7 @@ UM.PreferencesPage { top: parent.top right: parent.right + bottom: scrollView.top } model: settingVisibilityPresetsModel.items