QQuickIconLabel: ensure that icon color changes are respected

updateIcon() is no longer called, so we can move its contents into
syncImage(), which is called by updateOrSyncImage(), which is called by
QQuickIconLabel::setIcon().. which is called each time any of the icon
properties change (now that it's a value type).

Task-number: QTBUG-60807
Change-Id: Id1ff875e0855bd76755d49466f82c2eac36ffd09
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

2 files changed, 96 insertions, 0 deletions

diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
new file mode 100644
index 00000000..e60c32c8
--- /dev/null
+++ b/tests/auto/qquickiconlabel/data/colorChanges.qml
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+import QtQuick.Controls.impl 2.3
+
+AbstractButton {
+    id: button
+    width: 200
+    height: 200
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+    icon.color: enabled ? "transparent" : "red"
+
+    IconLabel {
+        icon: button.icon
+        text: button.text
+    }
+}
diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
index e311b8ac..a251b471 100644
--- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
@@ -32,6 +32,7 @@
 
 #include <QtQuick/qquickitem.h>
 #include <QtQuick/qquickview.h>
+#include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuickTemplates2/private/qquickicon_p.h>
 #include <QtQuickControls2/private/qquickiconimage_p.h>
@@ -54,6 +55,7 @@ private slots:
     void spacingWithOneDelegate_data();
     void spacingWithOneDelegate();
     void emptyIconSource();
+    void colorChanges();
 };
 
 tst_qquickiconlabel::tst_qquickiconlabel()
@@ -291,6 +293,34 @@ void tst_qquickiconlabel::emptyIconSource()
     QCOMPARE(text->x(), horizontalCenter - text->width() / 2);
 }
 
+void tst_qquickiconlabel::colorChanges()
+{
+    QQuickView view(testFileUrl("colorChanges.qml"));
+    QCOMPARE(view.status(), QQuickView::Ready);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    QQuickItem *rootItem = view.rootObject();
+    QVERIFY(rootItem);
+
+    QQuickIconLabel *label = rootItem->findChild<QQuickIconLabel *>();
+    QVERIFY(label);
+    QCOMPARE(label->spacing(), 0.0);
+    QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon);
+    QCOMPARE(label->isMirrored(), false);
+
+    QSharedPointer<QQuickItemGrabResult> grabResult = label->grabToImage();
+    QTRY_VERIFY(!grabResult->image().isNull());
+    const QImage enabledImageGrab = grabResult->image();
+
+    // The color should change to "red" when the item is disabled.
+    rootItem->setEnabled(false);
+
+    grabResult = label->grabToImage();
+    QTRY_VERIFY(!grabResult->image().isNull());
+    QVERIFY(grabResult->image() != enabledImageGrab);
+}
+
 QTEST_MAIN(tst_qquickiconlabel)
 
 #include "tst_qquickiconlabel.moc"