From cbf4f1f0b9817b489c5ad356f553d3d6ee86bcd6 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 4 Feb 2010 13:18:44 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: renaming Clips to Clips content
(Nigel)
---
.../qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml | 7 ++++---
src/plugins/debugger/breakhandler.cpp | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
index 11b87b54576..95b08ebb720 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
@@ -25,7 +25,7 @@ GroupBox {
}
CheckBox {
id: ClipCheckBox;
- text: "Clips";
+ text: "Clip Content";
backendValue: backendValues.clip === undefined ? false : backendValues.clip;
baseStateFlag: isBaseState;
checkable: true;
@@ -98,12 +98,13 @@ GroupBox {
id: ScaleSpinBox;
objectName: "ScaleSpinBox";
backendValue: backendValues.scale;
+ property var backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10
singleStep: 0.1
baseStateFlag: isBaseState;
- onBackendValueChanged: {
+ onBackendValueValueChanged: {
ScaleSlider.value = backendValue.value * 10;
}
}
@@ -112,7 +113,7 @@ GroupBox {
minimum: 1;
maximum: 100;
singleStep: 1;
- onValueChanged: {
+ onValueChanged: {
backendValues.scale.value = value / 10;
}
}
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 372ea133f48..decc1c0dfaf 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -33,7 +33,7 @@
#include "debuggermanager.h"
#include "stackframe.h"
-#include "imports.h" // TextEditor::BaseTextMark
+#include <texteditor/basetextmark.h>
#include <QtCore/QDebug>
#include <QtCore/QTextStream>
--
GitLab