From 5650dbc55df50600ea78409c03a091fb740cd5d9 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 13 Apr 2010 11:20:39 +0200
Subject: [PATCH] Replace 'var' by 'variant' in all Qml files
45ca7aff2c04c in qt.git replaces 'var' with 'variant'
Reviewed-by: Thomas Hartmann
---
share/qtcreator/qmldesigner/Button.qml | 2 +-
.../propertyeditor/Qt/CheckBox.qml | 4 +-
.../propertyeditor/Qt/ColorGroupBox.qml | 22 +++++-----
.../propertyeditor/Qt/ColorScheme.qml | 12 +++---
.../propertyeditor/Qt/ComboBox.qml | 10 ++---
.../propertyeditor/Qt/DoubleSpinBox.qml | 4 +-
.../Qt/DoubleSpinBoxAlternate.qml | 4 +-
.../propertyeditor/Qt/ExpressionEditor.qml | 2 +-
.../propertyeditor/Qt/Extended.qml | 12 +++---
.../Qt/ExtendedFunctionButton.qml | 2 +-
.../propertyeditor/Qt/ExtendedSwitches.qml | 4 +-
.../propertyeditor/Qt/FontComboBox.qml | 8 ++--
.../propertyeditor/Qt/FontGroupBox.qml | 2 +-
.../propertyeditor/Qt/GroupBox.qml | 6 +--
.../propertyeditor/Qt/GroupBoxOption.qml | 6 +--
.../propertyeditor/Qt/IntEditor.qml | 14 +++----
.../qmldesigner/propertyeditor/Qt/Layout.qml | 2 +-
.../propertyeditor/Qt/LineEdit.qml | 6 +--
.../propertyeditor/Qt/Modifiers.qml | 4 +-
.../propertyeditor/Qt/ScrollArea.qml | 2 +-
.../propertyeditor/Qt/SliderWidget.qml | 4 +-
.../qmldesigner/propertyeditor/Qt/SpinBox.qml | 6 +--
.../propertyeditor/Qt/Switches.qml | 2 +-
.../propertyeditor/Qt/Transformation.qml | 2 +-
.../qmldesigner/propertyeditor/Qt/Type.qml | 2 +-
.../propertyeditor/Qt/Visibility.qml | 2 +-
share/qtcreator/qmldesigner/welcomescreen.qml | 2 +-
.../components/itemlibrary/qml/Scrollbar.qml | 2 +-
.../itemlibrary/qml/SectionView.qml | 4 +-
.../stateseditor/HorizontalScrollBar.qml | 2 +-
.../components/stateseditor/stateslist.qml | 10 ++---
.../qml/qmldesigner/coretests/testcore.cpp | 2 +-
.../qmleditor/lookup/data/localIdLookup.qml | 40 +++++++++----------
.../qmleditor/lookup/data/localRootLookup.qml | 4 +-
.../lookup/data/localScopeLookup.qml | 6 +--
.../lookup/data/localScriptMethodLookup.qml | 18 ++++-----
36 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/share/qtcreator/qmldesigner/Button.qml b/share/qtcreator/qmldesigner/Button.qml
index c7f7b72cbc2..40212db26e2 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 4b1b69de938..3d8a34de17d 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 7dd9cd0cfe3..b84f3933f89 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();
}
@@ -147,7 +147,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 71f3888ae4a..ba97d7416d7 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 8ed53685721..f7d024d7c0a 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(); }
onItemsChanged: {
if (comboBox.backendValue.value == curentText)
@@ -55,7 +55,7 @@ QWidget {
box.setCurrentTextSilent(comboBox.backendValue.value);
}
- property var backendValueValue: comboBox.backendValue.value
+ property variant backendValueValue: comboBox.backendValue.value
onBackendValueValueChanged: {
if (comboBox.backendValue.value == curentText)
return;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index 5e1efa3e3c7..9728a662e10 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/DoubleSpinBoxAlternate.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
index 56c98854055..1680f62a0b0 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.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 70750d469cc..76c62703d92 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 cf888078777..7441c2d9934 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 4f234d3b8ef..bc84eb86f90 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 53a8620347c..9d93fc5177e 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 cd2cc4b82a1..5087d03afac 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 84bbcdbeb30..061962604c5 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: qsTr("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 ede937952e6..76731d3c97b 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 d0f0075f1fc..5a47a50de24 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 28eabd90829..97ef1b4377d 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
@@ -27,7 +27,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 abd19636562..5fee97d95c3 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 71c7a7c4c82..63934df685e 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 2f2d2aafd1b..74d48601d2a 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;
@@ -97,7 +97,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 dae19257750..8ded3b3585a 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: {
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
index 299028ce4b3..d6b3923e80a 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 ac655792175..e80fd08eb75 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 7b6a70b4384..faf0f0eb125 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 bead61ac9c3..43471a557b5 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
@@ -57,7 +57,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 6623e3a2519..bb8285e53e6 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 77f11974f6b..3f4f1e4e726 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 134a38de2af..29e83cc4816 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 731c8b49ae5..f3157a2b37d 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 07a0856caf8..0d52378c71e 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/HorizontalScrollBar.qml b/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml
index 975f3833e16..690f5f53a11 100644
--- a/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml
@@ -1,7 +1,7 @@
import Qt 4.6
Item {
- property var flickable: this;
+ property variant flickable: this;
property int viewPosition: 0;
property int viewSize: ( flickable.width>=0 ? flickable.width : 0 );
property int contentSize: ( flickable.contentWidth >= 0 ? flickable.contentWidth : 0 );
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index 3ac365855a9..ebb7d342c7d 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -108,7 +108,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
- property var color: parent.isCurrentState?highlightColor:"#4F4F4F";
+ property variant color: parent.isCurrentState?highlightColor:"#4F4F4F";
}
Item {
@@ -251,7 +251,7 @@ Rectangle {
id: underlay
Item {
anchors.fill:parent
- property var color: parent.color
+ property variant color: parent.color
clip:true
Rectangle {
width:parent.width
@@ -322,7 +322,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
- property var color: "#4f4f4f"
+ property variant color: "#4f4f4f"
}
Rectangle {
@@ -394,7 +394,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
- property var color: "#4f4f4f"
+ property variant color: "#4f4f4f"
}
Rectangle {
@@ -460,7 +460,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
- property var color: "#4f4f4f"
+ property variant color: "#4f4f4f"
}
Rectangle {
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index 21254f49975..023be2559b1 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -6025,7 +6025,7 @@ void TestCore::loadTestFiles()
QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2);
}
- QSKIP("See BAUHAUS-539 (component loading is broken)", SkipAll);
+ QSKIP("Fails because the text editor model doesn't know about components", SkipAll);
{ //usingbutton.qml
QFile file(manualTestPath + "/usingbutton.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
diff --git a/tests/auto/qml/qmleditor/lookup/data/localIdLookup.qml b/tests/auto/qml/qmleditor/lookup/data/localIdLookup.qml
index fd04eee4abb..fd34f4c6679 100644
--- a/tests/auto/qml/qmleditor/lookup/data/localIdLookup.qml
+++ b/tests/auto/qml/qmleditor/lookup/data/localIdLookup.qml
@@ -12,32 +12,32 @@ Item {
function opacity() {}
function visible() {}
}
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
- property var opacity: "wrong";
- property var visible: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
+ property variant opacity: "wrong";
+ property variant visible: "wrong";
Item {
id: y
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
- property var opacity: "wrong";
- property var visible: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
+ property variant opacity: "wrong";
+ property variant visible: "wrong";
Item {
id: z
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
- property var opacity: "wrong";
- property var visible: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
+ property variant opacity: "wrong";
+ property variant visible: "wrong";
Item {
id: opacity
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
- property var opacity: "wrong";
- property var visible: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
+ property variant opacity: "wrong";
+ property variant visible: "wrong";
Item {
id: visible
}
diff --git a/tests/auto/qml/qmleditor/lookup/data/localRootLookup.qml b/tests/auto/qml/qmleditor/lookup/data/localRootLookup.qml
index bc512720ee0..f4fa17909a0 100644
--- a/tests/auto/qml/qmleditor/lookup/data/localRootLookup.qml
+++ b/tests/auto/qml/qmleditor/lookup/data/localRootLookup.qml
@@ -5,10 +5,10 @@ import Qt 4.6
Rectangle {
id: theRoot
- property var prop
+ property variant prop
Item {
id: theParent
- property var prop
+ property variant prop
Item {
id: theChild
}
diff --git a/tests/auto/qml/qmleditor/lookup/data/localScopeLookup.qml b/tests/auto/qml/qmleditor/lookup/data/localScopeLookup.qml
index 6ef456baa8e..e2dd34da3d3 100644
--- a/tests/auto/qml/qmleditor/lookup/data/localScopeLookup.qml
+++ b/tests/auto/qml/qmleditor/lookup/data/localScopeLookup.qml
@@ -5,13 +5,13 @@ import Qt 4.6
Item {
id: theRoot
- property var prop
+ property variant prop
Item {
id: theParent
- property var prop
+ property variant prop
Item {
id: theChild
- property var prop
+ property variant prop
}
}
}
diff --git a/tests/auto/qml/qmleditor/lookup/data/localScriptMethodLookup.qml b/tests/auto/qml/qmleditor/lookup/data/localScriptMethodLookup.qml
index a4e535a9ae4..0a560f8fcfe 100644
--- a/tests/auto/qml/qmleditor/lookup/data/localScriptMethodLookup.qml
+++ b/tests/auto/qml/qmleditor/lookup/data/localScriptMethodLookup.qml
@@ -8,25 +8,25 @@ Item {
Script {
function x() {}
}
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
Item {
id: theParent
Script {
function y() {}
}
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
Item {
id: theChild
Script {
function z() {}
}
- property var x: "wrong";
- property var y: "wrong";
- property var z: "wrong";
+ property variant x: "wrong";
+ property variant y: "wrong";
+ property variant z: "wrong";
}
}
}
\ No newline at end of file
--
GitLab