Skip to content
GitLab
Commit 5650dbc5 authored by Kai Koehne's avatar Kai Koehne
Browse files

Replace 'var' by 'variant' in all Qml files 

45ca7aff2c04c in qt.git replaces 'var' with 'variant'

Reviewed-by: Thomas Hartmann
parent 99cbb2f8
Hide whitespace changes
Inline Side-by-side
share/qtcreator/qmldesigner/Button.qml
View file @ 5650dbc5
import Qt 4.6
Rectangle {
property var label: "Button"
property variant label: "Button"
signal clicked
width: 75
......
share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
View file @ 5650dbc5
......@@ -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
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
View file @ 5650dbc5
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
View file @ 5650dbc5
......@@ -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";
}
share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
View file @ 5650dbc5
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
View file @ 5650dbc5
......@@ -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
......
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
View file @ 5650dbc5
......@@ -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
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
View file @ 5650dbc5
......@@ -8,7 +8,7 @@ QWidget {
width: frame.width - 22
height: 40
property bool active: false
property var backendValue;
property variant backendValue;
onActiveChanged: {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
View file @ 5650dbc5
......@@ -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 {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
View file @ 5650dbc5
......@@ -4,7 +4,7 @@ import Bauhaus 1.0
QToolButton {
id: extendedFunctionButton
property var backendValue
property variant backendValue
function setIcon() {
if (backendValue == null)
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
View file @ 5650dbc5
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
View file @ 5650dbc5
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
View file @ 5650dbc5
......@@ -4,7 +4,7 @@ import Bauhaus 1.0
GroupBox {
id: fontGroupBox
caption: qsTr("Font")
property var showStyle: false
property variant showStyle: false
layout: VerticalLayout {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
View file @ 5650dbc5
......@@ -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();
......
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
View file @ 5650dbc5
......@@ -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();
......
share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
View file @ 5650dbc5
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
View file @ 5650dbc5
......@@ -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 {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
View file @ 5650dbc5
......@@ -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();
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
View file @ 5650dbc5
......@@ -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
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
View file @ 5650dbc5
......@@ -4,7 +4,7 @@ import Bauhaus 1.0
QScrollArea {
property var finished;
property variant finished;
onFinishedChanged: {
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment