diff options
| author | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
|---|---|---|
| committer | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
| commit | 0db75501a312dc9561eabfde26fbecef5f137c5a (patch) | |
| tree | 53a934ec39348aabd7b5002739092c9b089a333d /resources/qml/Preferences/Materials/MaterialsList.qml | |
| parent | 9fdeffd564aab5f896bd6405176b7a8491c69303 (diff) | |
| parent | 596c24657d39804c8bc94e6e8f99436115d7e411 (diff) | |
Merge remote-tracking branch 'origin/main' into PP-3_improved_experimental_bridge_settings
# Conflicts:
# resources/definitions/ultimaker.def.json
Diffstat (limited to 'resources/qml/Preferences/Materials/MaterialsList.qml')
| -rw-r--r-- | resources/qml/Preferences/Materials/MaterialsList.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml index bb40187825..913e213dae 100644 --- a/resources/qml/Preferences/Materials/MaterialsList.qml +++ b/resources/qml/Preferences/Materials/MaterialsList.qml @@ -2,8 +2,8 @@ // Uranium is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 -import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 +import QtQuick.Dialogs import UM 1.2 as UM import Cura 1.0 as Cura |