From 382531ab5e2270833d3805c57c00ebcf6b24d635 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Thu, 25 Apr 2019 18:23:32 +0300
Subject: QQuickIcon: properly resolve implicit values

when the property has not been set explicitly,
the resolved mask must not contain a respective bit set either

Change-Id: Iab0bd600b5bf458e26ed4601d4d2f608021f1518
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/auto/controls/data/tst_abstractbutton.qml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index 80155f69..ee26a6d6 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -599,7 +599,7 @@ TestCase {
         AbstractButton {
             action: Action {
                 text: "Default"
-                icon.name: "default"
+                icon.name: checked ? "checked" : "unchecked"
                 icon.source: "qrc:/icons/default.png"
                 checkable: true
                 checked: true
@@ -617,6 +617,7 @@ TestCase {
         compare(control.checkable, true)
         compare(control.checked, true)
         compare(control.enabled, false)
+        compare(control.icon.name, "checked")
 
         var textSpy = signalSpy.createObject(control, { target: control, signalName: "textChanged" })
         verify(textSpy.valid)
@@ -630,6 +631,7 @@ TestCase {
         compare(control.checkable, false) // propagates
         compare(control.checked, false) // propagates
         compare(control.enabled, true) // propagates
+        compare(control.icon.name, "unchecked") // propagates
         compare(textSpy.count, 1)
 
         // changes via button
@@ -637,19 +639,23 @@ TestCase {
         control.checkable = true
         control.checked = true
         control.enabled = false
+        control.icon.name = "default"
         compare(control.text, "Button")
         compare(control.checkable, true)
         compare(control.checked, true)
         compare(control.enabled, false)
+        compare(control.icon.name, "default")
         compare(control.action.text, "Action") // does NOT propagate
         compare(control.action.checkable, true) // propagates
         compare(control.action.checked, true) // propagates
         compare(control.action.enabled, true) // does NOT propagate
+        compare(control.action.icon.name, control.action.checked ? "checked" : "unchecked") // does NOT propagate
         compare(textSpy.count, 2)
 
         // remove the action so that only the button's properties are left
         control.action = null
         compare(control.text, "Button")
+        compare(control.icon.name, "default")
         compare(textSpy.count, 2)
 
         // setting an action while button has a particular property set
-- 
cgit v1.2.3