diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-09 21:52:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-09 21:54:50 +0100 |
| commit | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (patch) | |
| tree | 0450da77b661d2e97eb7628b4c667ee22c6dc443 /src/imports/controls/fusion | |
| parent | 2cdec3eadc7ac1d1e5c4cd505b60196e44df1a7d (diff) | |
| parent | 10b8f6af42a1cd80273d0a2d36e75b79078b5994 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/quicktemplates2/qquickabstractbutton_p.h
Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/CheckBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/fusion/ComboBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/fusion/GroupBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/fusion/RadioButton.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Switch.qml | 2 |
5 files changed, 0 insertions, 8 deletions
diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml index e2774b7c..4a10238d 100644 --- a/src/imports/controls/fusion/CheckBox.qml +++ b/src/imports/controls/fusion/CheckBox.qml @@ -68,8 +68,6 @@ T.CheckBox { font: control.font color: control.palette.windowText elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index 80128f1e..c4d49e0f 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -89,7 +89,6 @@ T.ComboBox { color: control.editable ? control.palette.text : control.palette.buttonText selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter background: PaddedRectangle { diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml index a43686c7..a98cc9a8 100644 --- a/src/imports/controls/fusion/GroupBox.qml +++ b/src/imports/controls/fusion/GroupBox.qml @@ -64,7 +64,6 @@ T.GroupBox { font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml index d6f5ddc4..612319b4 100644 --- a/src/imports/controls/fusion/RadioButton.qml +++ b/src/imports/controls/fusion/RadioButton.qml @@ -68,8 +68,6 @@ T.RadioButton { font: control.font color: control.palette.windowText elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml index 6cd0140b..0f5d484b 100644 --- a/src/imports/controls/fusion/Switch.qml +++ b/src/imports/controls/fusion/Switch.qml @@ -68,8 +68,6 @@ T.Switch { font: control.font color: control.palette.text elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } } |