Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorp.kuiper <p.kuiper@ultimaker.com>2022-05-30 08:59:50 +0300
committerp.kuiper <p.kuiper@ultimaker.com>2022-05-30 08:59:50 +0300
commit0db75501a312dc9561eabfde26fbecef5f137c5a (patch)
tree53a934ec39348aabd7b5002739092c9b089a333d /resources/qml/PrinterOutput/ExtruderBox.qml
parent9fdeffd564aab5f896bd6405176b7a8491c69303 (diff)
parent596c24657d39804c8bc94e6e8f99436115d7e411 (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/PrinterOutput/ExtruderBox.qml')
-rw-r--r--resources/qml/PrinterOutput/ExtruderBox.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml
index bea7c3bdd8..e567d5d4cb 100644
--- a/resources/qml/PrinterOutput/ExtruderBox.qml
+++ b/resources/qml/PrinterOutput/ExtruderBox.qml
@@ -1,7 +1,7 @@
//Copyright (c) 2022 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
-import QtQuick 2.2
+import QtQuick 2.15
import QtQuick.Controls 2.1
import UM 1.5 as UM
@@ -206,7 +206,7 @@ Item
selectByMouse: true
maximumLength: 5
enabled: parent.enabled
- validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
+ validator: RegularExpressionValidator { regularExpression: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.right: unit.left