summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-04-14 16:41:03 +0200
committerKai Koehne <kai.koehne@nokia.com>2010-04-14 16:59:19 +0200
commit62b766c731d451441b7477b9d9f7e2766c44feac (patch)
tree16c66913024d8c9aa6fb0c725905aec3273b46e4
parent7d377d398b4f212e52028842cf23647435aef1b6 (diff)
downloadqt-creator-62b766c731d451441b7477b9d9f7e2766c44feac.tar.gz
Replace 'var' by 'variant' in all Qml files
This is commit 5650dbc55df (master) redone. We cannot cherry-pick the original commit due to lot's of conflicts ... Reviewed-by: Thomas Hartmann Reviewed-by: con
-rw-r--r--share/qtcreator/qmldesigner/Button.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml22
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml12
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml8
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml12
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml8
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml6
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml6
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml14
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml6
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml6
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml2
-rw-r--r--share/qtcreator/qmldesigner/welcomescreen.qml2
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml2
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml4
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateslist.qml6
29 files changed, 77 insertions, 77 deletions
diff --git a/share/qtcreator/qmldesigner/Button.qml b/share/qtcreator/qmldesigner/Button.qml
index c7f7b72cbc..40212db26e 100644
--- a/share/qtcreator/qmldesigner/Button.qml
+++ b/share/qtcreator/qmldesigner/Button.qml
@@ -1,7 +1,7 @@
import Qt 4.6
Rectangle {
- property var label: "Button"
+ property variant label: "Button"
signal clicked
width: 75
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
index 4b1b69de93..3d8a34de17 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
@@ -5,9 +5,9 @@ QWidget { //This is a special checkBox that does color coding for states
id: checkBox;
- property var backendValue;
+ property variant backendValue;
- property var baseStateFlag;
+ property variant baseStateFlag;
property alias checkable: localCheckBox.checkable
property alias text: localLabel.text
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index 55e9951f2a..3a13949ede 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
@@ -4,14 +4,14 @@ import Bauhaus 1.0
QExtGroupBox {
id: colorGroupBox
- property var finished;
- property var backendColor
- property var color: (backendColor === undefined || backendColor.value === undefined) ? "#000000" : backendColor.value
- property var oldMaximumHeight;
-
- property var startupCollapse: selectionChanged === undefined ? false : selectionChanged;
- property var firstTime: true;
- property var caption: ""
+ property variant finished;
+ property variant backendColor
+ property variant color: (backendColor === undefined || backendColor.value === undefined) ? "#000000" : backendColor.value
+ property variant oldMaximumHeight;
+
+ property variant startupCollapse: selectionChanged === undefined ? false : selectionChanged;
+ property variant firstTime: true;
+ property variant caption: ""
smooth: false
onFinishedChanged: {
@@ -32,14 +32,14 @@ QExtGroupBox {
}
- property var baseStateFlag: isBaseState
+ property variant baseStateFlag: isBaseState
onBaseStateFlagChanged: {
evaluate();
}
onBackendColorChanged: {
evaluate();
}
- property var isEnabled: colorGroupBox.enabled
+ property variant isEnabled: colorGroupBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -143,7 +143,7 @@ QExtGroupBox {
ColorBox {
id: colorControl;
- property var backendColor: colorGroupBox.color;
+ property variant backendColor: colorGroupBox.color;
color: colorGroupBox.color;
onColorChanged: if (colorGroupBox.color != color) {
colorGroupBox.backendColor.value = color;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
index 71f3888ae4..ba97d7416d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
@@ -3,10 +3,10 @@ import Bauhaus 1.0
Item {
id: colorScheme
- property var disabledColor: "gray";
- property var defaultColor: "white";
- property var boldTextColor: "#dedede";
- property var changedBaseColor: "#9999ff";
- property var changedStateColor: "#99ccff";
- property var optionsColor: "white";
+ property variant disabledColor: "gray";
+ property variant defaultColor: "white";
+ property variant boldTextColor: "#dedede";
+ property variant changedBaseColor: "#9999ff";
+ property variant changedStateColor: "#99ccff";
+ property variant optionsColor: "white";
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
index f83e985ea9..51e0d3ef18 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
@@ -5,8 +5,8 @@ QWidget {
id: comboBox
- property var backendValue;
- property var baseStateFlag;
+ property variant backendValue;
+ property variant baseStateFlag;
property alias enabled: box.enabled;
property alias items: box.items;
@@ -17,7 +17,7 @@ QWidget {
evaluate();
}
- property var isEnabled: comboBox.enabled
+ property variant isEnabled: comboBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -47,7 +47,7 @@ QWidget {
layout: HorizontalLayout {
QComboBox {
id: box
- property var backendValue: comboBox.backendValue
+ property variant backendValue: comboBox.backendValue
onCurrentTextChanged: { backendValue.value = currentText; evaluate(); }
ExtendedFunctionButton {
backendValue: comboBox.backendValue;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index 5e1efa3e3c..9728a662e1 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -5,8 +5,8 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
id: doubleSpinBox;
- property var backendValue;
- property var baseStateFlag;
+ property variant backendValue;
+ property variant baseStateFlag;
property alias singleStep: box.singleStep
property alias minimum: box.minimum
property alias maximum: box.maximum
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
index 70750d469c..76c62703d9 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
@@ -8,7 +8,7 @@ QWidget {
width: frame.width - 22
height: 40
property bool active: false
- property var backendValue;
+ property variant backendValue;
onActiveChanged: {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
index 155a02642c..899e824279 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
@@ -8,8 +8,8 @@ GroupBox {
layout: VerticalLayout{
- property var effect: backendValues.effect
- property var complexNode: effect.complexNode
+ property variant effect: backendValues.effect
+ property variant complexNode: effect.complexNode
QWidget {
maximumHeight: 40;
@@ -19,8 +19,8 @@ GroupBox {
}
QComboBox {
enabled: isBaseState;
- property var type: backendValues.effect.complexNode.type
- property var dirty;
+ property variant type: backendValues.effect.complexNode.type
+ property variant dirty;
id: effectComboBox;
items : { [
"None",
@@ -60,7 +60,7 @@ GroupBox {
}
}// QWidget
- property var properties: complexNode == null ? null : complexNode.properties
+ property variant properties: complexNode == null ? null : complexNode.properties
QWidget {
minimumHeight: 20;
@@ -101,7 +101,7 @@ GroupBox {
visible: effectComboBox.currentText == "Colorize";
layout: QVBoxLayout {
- property var colorProp: properties == null ? null : properties.color
+ property variant colorProp: properties == null ? null : properties.color
ColorLabel {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
index 70bfbd2227..1c82f95c1c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
@@ -4,7 +4,7 @@ import Bauhaus 1.0
QToolButton {
id: extendedFunctionButton
- property var backendValue
+ property variant backendValue
function setIcon() {
if (backendValue == null)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
index 53a8620347..9d93fc5177 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
@@ -6,9 +6,9 @@ QFrame {
focusPolicy: "Qt::NoFocus"
id: extendedSwitches;
property bool active: false;
- property var backendValue;
+ property variant backendValue;
styleSheetFile: "switch.css";
- property var specialModeIcon;
+ property variant specialModeIcon;
specialModeIcon: "images/standard.png";
opacity: 0;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
index cd2cc4b82a..5087d03afa 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
@@ -5,8 +5,8 @@ QWidget {
id: fontComboBox
property alias currentFont: fontSelector.currentFont
- property var backendValue
- property var baseStateFlag;
+ property variant backendValue
+ property variant baseStateFlag;
property alias enabled: fontSelector.enabled
onBaseStateFlagChanged: {
@@ -17,7 +17,7 @@ QWidget {
evaluate();
}
- property var isEnabled: fontComboBox.enabled
+ property variant isEnabled: fontComboBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -59,7 +59,7 @@ QWidget {
id: fontSelector
currentFont.family: backendValue.value
- property var fontFamily: currentFont.family
+ property variant fontFamily: currentFont.family
onFontFamilyChanged: {
if (backendValue === undefined)
return;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
index 8f7a86c96a..9218c85819 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
@@ -4,7 +4,7 @@ import Bauhaus 1.0
GroupBox {
id: fontGroupBox
caption: "Font";
- property var showStyle: false
+ property variant showStyle: false
layout: VerticalLayout {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
index ede937952e..76731d3c97 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
@@ -4,11 +4,11 @@ import Bauhaus 1.0
QExtGroupBox {
id: groupBox;
- property var finished;
+ property variant finished;
- property var caption;
+ property variant caption;
- property var oldMaximumHeight;
+ property variant oldMaximumHeight;
onFinishedChanged: {
checkBox.raise();
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
index d0f0075f1f..5a47a50de2 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
@@ -4,11 +4,11 @@ import Bauhaus 1.0
QExtGroupBox {
id: groupBoxOption;
- property var finished;
+ property variant finished;
- property var caption;
+ property variant caption;
- property var oldMaximumHeight;
+ property variant oldMaximumHeight;
onFinishedChanged: {
CheckBox.raise();
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
index f39c0c08d4..17209ae011 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
@@ -4,14 +4,14 @@ import Bauhaus 1.0
QWidget {
id: intEditor;
- property var backendValue;
- property var baseStateFlag;
+ property variant backendValue;
+ property variant baseStateFlag;
- property var caption;
+ property variant caption;
- property var maximumValue: 99
- property var minimumValue: 0
- property var step: 1
+ property variant maximumValue: 99
+ property variant minimumValue: 0
+ property variant step: 1
property bool slider: true
property alias alignment: label.alignment
@@ -26,7 +26,7 @@ QWidget {
intEditor.backendValue === null)
? null : intEditor.backendValue;
- property var backendValueValue: (intEditor.backendValue === undefined ||
+ property variant backendValueValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
? null : intEditor.backendValue.value;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
index 19e9c21cec..f0c0bae8f7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
@@ -9,7 +9,7 @@ GroupBox {
id: layout;
enabled: anchorBackend.hasParent;
- property var targetLabelWidth: 90 - 20 - 26
+ property variant targetLabelWidth: 90 - 20 - 26
property int leftMarginMargin: 16
layout: VerticalLayout {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
index da44e7de9f..b0abe12fb7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
@@ -4,9 +4,9 @@ import Bauhaus 1.0
QWidget {
id: lineEdit
- property var backendValue
+ property variant backendValue
property alias enabled: lineEdit.enabled
- property var baseStateFlag
+ property variant baseStateFlag
property alias text: lineEditWidget.text
property alias readOnly: lineEditWidget.readOnly
@@ -16,7 +16,7 @@ QWidget {
evaluate();
}
- property var isEnabled: lineEdit.enabled
+ property variant isEnabled: lineEdit.enabled
onIsEnabledChanged: {
evaluate();
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
index d9c6f4a7b7..f8a9cc00fb 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
@@ -43,7 +43,7 @@ GroupBox {
text: ""
id: opacitySpinBox;
backendValue: backendValues.opacity === undefined ? null : backendValues.opacity
- property var backendValueValue: backendValues.opacity.value;
+ property variant backendValueValue: backendValues.opacity.value;
minimumWidth: 60;
minimum: 0;
maximum: 1;
@@ -101,7 +101,7 @@ GroupBox {
id: scaleSpinBox;
backendValue: backendValues.scale;
- property var backendValueValue: backendValues.scale.value;
+ property variant backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
index 19acd3361a..8236c585af 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
@@ -4,7 +4,7 @@ import Bauhaus 1.0
QScrollArea {
- property var finished;
+ property variant finished;
onFinishedChanged: {
setupProperWheelBehaviour();
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
index 299028ce4b..d6b3923e80 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
@@ -4,11 +4,11 @@ import Bauhaus 1.0
QWidget {
id: sliderWidget
- property var value
+ property variant value
property alias singleStep: localSlider.singleStep
property alias minimum: localSlider.minimum
property alias maximum: localSlider.maximum
- property var backendValue
+ property variant backendValue
QSlider {
orientation: "Qt::Horizontal";
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index ac65579217..e80fd08eb7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -5,8 +5,8 @@ QWidget { //This is a special spinBox that does color coding for states
id: spinBox;
- property var backendValue;
- property var baseStateFlag;
+ property variant backendValue;
+ property variant baseStateFlag;
property alias singleStep: box.singleStep;
property alias minimum: box.minimum
property alias maximum: box.maximum
@@ -22,7 +22,7 @@ QWidget { //This is a special spinBox that does color coding for states
evaluate();
}
- property var isEnabled: spinBox.enabled
+ property variant isEnabled: spinBox.enabled
onIsEnabledChanged: {
evaluate();
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
index 7b6a70b438..faf0f0eb12 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
@@ -3,7 +3,7 @@ import Bauhaus 1.0
QFrame {
styleSheetFile: "switch.css";
- property var specialModeIcon;
+ property variant specialModeIcon;
specialModeIcon: "images/standard.png";
maximumWidth: 300;
minimumWidth: 300;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
index b9cdefe756..33dde18e29 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
@@ -43,7 +43,7 @@ GroupBox {
id: scaleSpinBox;
backendValue: backendValues.scale;
- property var backendValueValue: backendValues.scale.value;
+ property variant backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
index 6623e3a251..bb8285e53e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
@@ -22,7 +22,7 @@ GroupBox {
}
}
QWidget {
- property var isEnabled: isBaseState
+ property variant isEnabled: isBaseState
onIsEnabledChanged: idLineEdit.setStyleSheet("color: "+(isEnabled?scheme.defaultColor:scheme.disabledColor));
ColorScheme{ id:scheme }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
index 1768e5937a..566a8444c1 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
@@ -41,7 +41,7 @@ GroupBox {
text: ""
id: opacitySpinBox;
backendValue: backendValues.opacity
- property var backendValueValue: backendValues.opacity.value;
+ property variant backendValueValue: backendValues.opacity.value;
minimumWidth: 60;
minimum: 0;
maximum: 1;
diff --git a/share/qtcreator/qmldesigner/welcomescreen.qml b/share/qtcreator/qmldesigner/welcomescreen.qml
index 134a38de2a..29e83cc481 100644
--- a/share/qtcreator/qmldesigner/welcomescreen.qml
+++ b/share/qtcreator/qmldesigner/welcomescreen.qml
@@ -2,7 +2,7 @@ import Qt 4.6
Image {
id: screen
- property var selectedFile
+ property variant selectedFile
signal openFile
source: "gradient.png"
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
index 91ecb8641d..43142deb2e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
@@ -36,7 +36,7 @@ Item {
// public
- property var flickable
+ property variant flickable
function reset() {
handle.y = 0
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
index 07a0856caf..0d52378c71 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
@@ -36,13 +36,13 @@ Column {
// public
- property var itemHighlight
+ property variant itemHighlight
property int entriesPerRow
property int cellWidth
property int cellHeight
- property var currentItem: gridView.currentItem
+ property variant currentItem: gridView.currentItem
function expand() {
gridFrame.state = ""
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index ef840ac110..0b9f4d3ce5 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -230,9 +230,9 @@ Rectangle {
}
}
- property var buttonColorUp: "#E1E1E1"
- property var buttonColorDown: Qt.darker(buttonColorUp)
- property var buttonColor: buttonColorUp
+ property variant buttonColorUp: "#E1E1E1"
+ property variant buttonColorDown: Qt.darker(buttonColorUp)
+ property variant buttonColor: buttonColorUp
Item {
width:parent.width