diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-01 09:56:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-01 10:05:21 +0100 |
| commit | 91d1fc42d37501555fea3674b93f5fd81401b518 (patch) | |
| tree | 5c9150606db89a00989d7a3450c287efbeb1b7cd /src/imports/controls/material/ComboBox.qml | |
| parent | 8b5490c3acb2731cc5bf7b968128138d96259939 (diff) | |
| parent | a19ab6806043591abf94868de6962a3747284da7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
Diffstat (limited to 'src/imports/controls/material/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 0721e8f3..c76834bf 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -108,13 +108,6 @@ T.ComboBox { radius: control.flat ? 0 : 2 color: !control.editable ? control.Material.dialogColor : "transparent" - Behavior on color { - enabled: !control.editable - ColorAnimation { - duration: 400 - } - } - layer.enabled: control.enabled && !control.editable && control.Material.background.a > 0 layer.effect: ElevationEffect { elevation: control.Material.elevation |