feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.propertyEditor: renaming Clips to Clips content (Nigel)

Browse Source
This commit is contained in:
Thomas Hartmann
2010-02-04 13:18:44 +01:00
parent 6f52e5878a
commit cbf4f1f0b9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
View File

@@ -25,7 +25,7 @@ GroupBox {
} }
CheckBox { CheckBox {
id: ClipCheckBox; id: ClipCheckBox;
text: "Clips"; text: "Clip Content";
backendValue: backendValues.clip === undefined ? false : backendValues.clip; backendValue: backendValues.clip === undefined ? false : backendValues.clip;
baseStateFlag: isBaseState; baseStateFlag: isBaseState;
checkable: true; checkable: true;
@@ -98,12 +98,13 @@ GroupBox {
id: ScaleSpinBox; id: ScaleSpinBox;
objectName: "ScaleSpinBox"; objectName: "ScaleSpinBox";
backendValue: backendValues.scale; backendValue: backendValues.scale;
property var backendValueValue: backendValues.scale.value;
minimumWidth: 60; minimumWidth: 60;
minimum: 0.01 minimum: 0.01
maximum: 10 maximum: 10
singleStep: 0.1 singleStep: 0.1
baseStateFlag: isBaseState; baseStateFlag: isBaseState;
onBackendValueChanged: { onBackendValueValueChanged: {
ScaleSlider.value = backendValue.value * 10; ScaleSlider.value = backendValue.value * 10;
} }
} }

2
src/plugins/debugger/breakhandler.cpp
View File

@@ -33,7 +33,7 @@
#include "debuggermanager.h" #include "debuggermanager.h"
#include "stackframe.h" #include "stackframe.h"
#include "imports.h" // TextEditor::BaseTextMark #include <texteditor/basetextmark.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>