1 files changed, 26 insertions, 29 deletions

diff --git a/tests/auto/qmltest/bars3d/tst_barseries.qml b/tests/auto/qmltest/bars3d/tst_barseries.qml
index 3db19615..7ee38d29 100644
--- a/tests/auto/qmltest/bars3d/tst_barseries.qml
+++ b/tests/auto/qmltest/bars3d/tst_barseries.qml
@@ -1,34 +1,8 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Data Visualization module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick 2.0
-import QtDataVisualization 1.2
+import QtDataVisualization
 import QtTest 1.0
 
 Item {
@@ -64,6 +38,20 @@ Item {
         ]
     }
 
+    ThemeColor {
+        id: rowColor1
+        color: "green"
+    }
+
+    ThemeColor {
+        id: rowColor2
+        color: "blue"
+    }
+    ThemeColor {
+        id: rowColor3
+        color: "red"
+    }
+
     Bar3DSeries {
         id: initialized
         dataProxy: ItemModelBarDataProxy {
@@ -92,6 +80,7 @@ Item {
         singleHighlightGradient: gradient3
         userDefinedMesh: ":/customitem.obj"
         visible: false
+        rowColors: [ rowColor1, rowColor2, rowColor3 ]
     }
 
     ItemModelBarDataProxy {
@@ -118,6 +107,7 @@ Item {
             compare(initial.invalidSelectionPosition, Qt.point(-1, -1))
             compare(initial.meshAngle, 0)
             compare(initial.selectedBar, Qt.point(-1, -1))
+            compare(initial.rowColors.length, 0)
         }
 
         function test_2_initial_common() {
@@ -149,6 +139,7 @@ Item {
             compare(initialized.dataProxy.rowCount, 2)
             fuzzyCompare(initialized.meshAngle, 15.0, 0.01)
             compare(initialized.selectedBar, Qt.point(0, 0))
+            compare(initialized.rowColors.length, 3)
         }
 
         function test_2_initialized_common() {
@@ -177,6 +168,7 @@ Item {
             change.dataProxy = proxy1
             change.meshAngle = 15.0
             change.selectedBar = Qt.point(0, 0)
+            change.rowColors = [rowColor1, rowColor2, rowColor3]
         }
 
         function test_2_test_change() {
@@ -222,5 +214,10 @@ Item {
             gradient1.stops[0].color = "yellow"
             compare(change.baseGradient.stops[0].color, "#ffff00")
         }
+
+        function test_5_change_rowColors() {
+            rowColor2.color = "purple"
+            compare(change.rowColors[1].color, "#800080")
+        }
     }
 }