diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-01 17:16:04 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-01 17:16:04 +0000 |
| commit | 23ea3f7a3359b0cd28bc0b38512f2764d19367c3 (patch) | |
| tree | 480bc835fc80d3029de9f308580bdcbcf572f287 /src/imports | |
| parent | b23a0dc60f72ad02475a234deb7137f7ab170d14 (diff) | |
| parent | 911b72e7591e364cc8d17a30f6b54bcf0f20031c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/CheckIndicator.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/Dial.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/MenuItem.qml | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index 2bc87fe6..a3137ff1 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -58,7 +58,7 @@ Rectangle { ColorImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - color: control.visualFocus ? Default.focusColor : Default.textColor + color: control.visualFocus ? Default.focusColor : undefined source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" visible: control.checkState === Qt.Checked } diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index a3735880..2c834d8d 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -64,7 +64,7 @@ T.ComboBox { indicator: ColorImage { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 - color: !control.editable && control.visualFocus ? Default.focusColor : Default.textColor + color: !control.editable && control.visualFocus ? Default.focusColor : undefined source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png" opacity: enabled ? 1 : 0.3 } diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index f33ebf72..ae5e490a 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -59,7 +59,7 @@ T.Dial { y: background.y + background.height / 2 - handle.height / 2 width: 14 height: 10 - color: control.visualFocus ? Default.focusColor : Default.textColor + color: control.visualFocus ? Default.focusColor : undefined source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/dial-indicator.png" antialiasing: true opacity: control.enabled ? 1 : 0.3 diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 225f9310..c3be68f6 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -79,7 +79,7 @@ T.MenuItem { visible: control.checked source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : "" - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.enabled ? undefined : Default.textDisabledColor } arrow: ColorImage { @@ -89,7 +89,7 @@ T.MenuItem { visible: control.subMenu mirror: control.mirrored source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : "" - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.enabled ? undefined : Default.textDisabledColor } background: Item { |