summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest/surface3d
diff options
context:
space:
mode:
authorSami Varanka <sami.varanka@qt.io>2021-06-29 18:57:12 +0300
committerSami Varanka <sami.varanka@qt.io>2021-08-06 08:59:55 +0300
commit3513884f6838d31e72c462ee358293c2e797f04b (patch)
treebc6ffd9c469d8bb55e228fa80ed9f8a8b8bdb9fd /tests/auto/qmltest/surface3d
parent4b9fc0883ac6955089b3d552227cba1a8cea6087 (diff)
Add: Colorize surfaceseries wireframe
Added color property for surfaceseries wireframe. Modified surfaceseries cpptest and qmltest to test the added property. In addition, the documentation for the property was added. Modified qmlsurface example to use the new property. Fixes: QTBUG-64748 Change-Id: I18f56258cdba2b3270dce7c8313cbf17e499ff39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'tests/auto/qmltest/surface3d')
-rw-r--r--tests/auto/qmltest/surface3d/tst_surfaceseries.qml5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
index a4593c94..0428ab53 100644
--- a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
+++ b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
@@ -79,6 +79,7 @@ Item {
flatShadingEnabled: false
selectedPoint: Qt.point(0, 0)
textureFile: ":\customtexture.jpg"
+ wireFrameColor: "red"
baseColor: "blue"
baseGradient: gradient1
@@ -123,6 +124,7 @@ Item {
compare(initial.flatShadingEnabled, true)
compare(initial.flatShadingSupported, true)
compare(initial.selectedPoint, Qt.point(-1, -1))
+ compare(initial.wireFrameColor, "#000000")
}
function test_2_initial_common() {
@@ -156,6 +158,7 @@ Item {
compare(initialized.flatShadingEnabled, false)
compare(initialized.selectedPoint, Qt.point(0, 0))
compare(initialized.textureFile, ":\customtexture.jpg")
+ compare(initialized.wireFrameColor, "#ff0000")
}
function test_2_initialized_common() {
@@ -187,6 +190,7 @@ Item {
change.flatShadingEnabled = false
change.selectedPoint = Qt.point(0, 0)
change.textureFile = ":\customtexture.jpg"
+ change.wireFrameColor = "green"
}
function test_2_test_change() {
@@ -196,6 +200,7 @@ Item {
compare(change.flatShadingEnabled, false)
compare(change.selectedPoint, Qt.point(0, 0))
compare(change.textureFile, ":\customtexture.jpg")
+ compare(change.wireFrameColor, "#008000")
}
function test_3_change_common() {