summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qmltest/surface3d/tst_surfaceseries.qml')
-rw-r--r--tests/auto/qmltest/surface3d/tst_surfaceseries.qml40
1 files changed, 7 insertions, 33 deletions
diff --git a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
index e4707f60..7d681021 100644
--- a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
+++ b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
@@ -1,31 +1,5 @@
-/****************************************************************************
-**
-** 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
@@ -79,7 +53,7 @@ Item {
flatShadingEnabled: false
selectedPoint: Qt.point(0, 0)
textureFile: ":\customtexture.jpg"
- wireFrameColor: "red"
+ wireframeColor: "red"
baseColor: "blue"
baseGradient: gradient1
@@ -124,7 +98,7 @@ Item {
compare(initial.flatShadingEnabled, true)
compare(initial.flatShadingSupported, true)
compare(initial.selectedPoint, Qt.point(-1, -1))
- compare(initial.wireFrameColor, "#000000")
+ compare(initial.wireframeColor, "#000000")
}
function test_2_initial_common() {
@@ -158,7 +132,7 @@ Item {
compare(initialized.flatShadingEnabled, false)
compare(initialized.selectedPoint, Qt.point(0, 0))
compare(initialized.textureFile, ":\customtexture.jpg")
- compare(initialized.wireFrameColor, "#ff0000")
+ compare(initialized.wireframeColor, "#ff0000")
}
function test_2_initialized_common() {
@@ -190,7 +164,7 @@ Item {
change.flatShadingEnabled = false
change.selectedPoint = Qt.point(0, 0)
change.textureFile = ":\customtexture.jpg"
- change.wireFrameColor = "green"
+ change.wireframeColor = "green"
}
function test_2_test_change() {
@@ -200,7 +174,7 @@ Item {
compare(change.flatShadingEnabled, false)
compare(change.selectedPoint, Qt.point(0, 0))
compare(change.textureFile, ":\customtexture.jpg")
- compare(change.wireFrameColor, "#008000")
+ compare(change.wireframeColor, "#008000")
}
function test_3_change_common() {