From 337a656443794a4fd66831d819d40c39ca2566fb Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 22 Feb 2010 15:48:34 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: avoiding binding loops in
IntEditor.qml
---
.../propertyeditor/Qt/IntEditor.qml | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
index bb8f4cb6706..6dcddbde878 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
@@ -25,12 +25,18 @@ QWidget {
backendValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
? null : intEditor.backendValue;
+
+ property var backendValueValue: (intEditor.backendValue === undefined ||
+ intEditor.backendValue === null)
+ ? null : intEditor.backendValue.value;
+
+ onBackendValueValueChanged: {
+ intSlider.value = intEditor.backendValue.value;
+ }
minimum: minimumValue
maximum: maximumValue
- baseStateFlag: (intEditor.backendValue === undefined ||
- intEditor.backendValue === null)
- ? null : intEditor.baseStateFlag;
+ baseStateFlag: intEditor.baseStateFlag
}
@@ -38,6 +44,7 @@ QWidget {
visible: intEditor.slider
id: sliderWidget
QSlider {
+ id: intSlider
y: sliderWidget.height / 2 - 12
width: sliderWidget.width
height: 24
@@ -46,15 +53,14 @@ QWidget {
minimum: minimumValue
maximum: maximumValue
singleStep: step
-
- value: (backendValue == undefined
- || backendValue == null
- || backendValue.value == undefined
- || backendValue.value == null) ? 0 : backendValue.value
+
+
onValueChanged: {
if (backendValue != undefined && backendValue != null)
backendValue.value = value;
}
+
+
onSliderPressed: {
backendValue.lock();
--
GitLab