diff --git a/share/qtcreator/qmldesigner/Button.qml b/share/qtcreator/qmldesigner/Button.qml
index c7f7b72cbc21b77ceffa36bb3007b3a0f9cc3b0d..40212db26e24d065e88cc19c21b1e3b55fc4d982 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 4b1b69de938a47a0827b679dac13834af856a01a..3d8a34de17d9f4ccb47937f545d22d1edbaa2d8f 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 7dd9cd0cfe3b67561b088a20d5ae74a710e2c92c..b84f3933f89cfa544cd11d73dfc1d3b417932804 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 71f3888ae4a336344d79faf8e3d51e80f731a2a5..ba97d7416d74c8c3fdca94ca2ccb56e3e619e4fa 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 8ed536857216b7915a8913be43cbca2770f27aa0..f7d024d7c0aca2b267f83ba457b633f28ee87619 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 5e1efa3e3c7a6eeb1bf1adbb6f70bde5f42a1220..9728a662e10bb373a2071f85a0bc7ae77703c492 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 56c98854055448fbee31deb529527da8ff23f55f..1680f62a0b0dd5d875820a15b8310f65a0298dec 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 70750d469ccfb135d776d6241b0b32a1f1c813da..76c62703d925efd8cf8010271f5f4a1181eb3872 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 cf8880787772390a424e98b6cbf3120c48a533e5..7441c2d9934f08ec2925eb27ac6624ed3aac18b2 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 4f234d3b8ef185b3d31451dc9efe592df0d93b0c..bc84eb86f90ec4a4d8d83545b05fe39f06f6b46e 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 53a8620347cd58df3b49f3e0e71af0ceca914562..9d93fc5177ed9cb39b102ba580befa7747211b17 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 cd2cc4b82a1c94bd71f40ca6506a63662fbce0cf..5087d03afac2ffa1f48c9174dfaa2c46bcc7a549 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 84bbcdbeb302a62743b8b12d6e3f96b315f86a6e..061962604c571366db0e027cb6e77901d3ca06e8 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 ede937952e6ac5abb0db966cb3180ed5600ee226..76731d3c97b5773d109443b39a19563f0dffddd5 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 d0f0075f1fccf8f87aa7118c6534203b770bfd4f..5a47a50de24f9027a0d66c282b41e9b439a1daa6 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 28eabd908292f195b365f3209021cb189ad80b58..97ef1b4377dfbdbadb7d1b733ee8b708d0e546df 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 abd196365625fa12ecfc5237806490bbf75f6388..5fee97d95c3a93c2a1fe21122cda1718891e513a 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 71c7a7c4c821e6a16972cc422efdf84371b9ec3c..63934df685e65c6a1142c8c9e85fe9d36b18b6e6 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 2f2d2aafd1b2ae507b2f67cc6fa7c8ae558a4dc6..74d48601d2a23c355f776bd4b0d509dfca32e9ba 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 dae19257750df56ca1bad447696edbf50e24cb9b..8ded3b3585a61fc5164c8daf3ad57cc38ad17b16 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 299028ce4b3e25dac55da1cce9fafc794ebd3b85..d6b3923e80ae44022aba253fc497c1e5631965c6 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 ac65579217550f161e876425adf7b5d52b6be44d..e80fd08eb7584a81227c0f5bac2b817e2e4b8824 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 7b6a70b4384304d908cbc95ff79d18038910c575..faf0f0eb12557e6ffaea09240bad280da64516be 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 bead61ac9c39f455dc26a48ef04f16c8a4e17aeb..43471a557b5a6491c6b8edd84f184e2bc4340ae4 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 6623e3a2519b226f703c622737430ed0031ba532..bb8285e53e6d82046ea15e6b2ae4bf20342a0d06 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 77f11974f6b862c4e1676e2e26b5bf94691caff9..3f4f1e4e726761119c98edf2917ce98ac7f5871d 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 134a38de2af922f1e95d2c0a0a9b70c2fb954015..29e83cc4816e96998d1703c50a01c6edff36122e 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 731c8b49ae54e9101f7ada0a2e7d60d87111a97f..f3157a2b37dd5dd7dbca226752fd3f6abc0743e7 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 07a0856caf896b0156905a359e41f7c5c92f3435..0d52378c71e4202f4c4b530fddb99f449e1bb599 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 975f3833e16d098a9420bcfb8b3761ac0f027c58..690f5f53a119d09098af12e0511dfd3fa6b77a81 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 3ac365855a93d944595fb37c12254c1f70f90e0a..ebb7d342c7d7afeae506fdbdaba2a03a38072eb5 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 21254f49975a13add8b9da26af3857276ef27e75..023be2559b1046f227126329f95e732387c1dddf 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 fd04eee4abb6e40392c23d63077bee3a5c02c205..fd34f4c6679864cfce36e16bfccd68a90b5372f8 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 bc512720ee09f40c4ef09ee24a7e103353cf461d..f4fa17909a038c1b8642858c634be6c5f7684341 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 6ef456baa8eecf69ef40c0669f291dd02507c9fa..e2dd34da3d357c896cc76e5f3a99e136d586f40a 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 a4e535a9ae4a8d76b67cdc52bd25c3d173fc69ae..0a560f8fcfeeda3e38f9804c7977e4f8217696cd 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