summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/datavisualization/data/qcustom3dlabel.cpp1
-rw-r--r--src/datavisualization/data/qcustom3dvolume.cpp1
-rw-r--r--tests/auto/qmltest/axis3d/tst_category.qml29
-rw-r--r--tests/auto/qmltest/axis3d/tst_logvalue.qml29
-rw-r--r--tests/auto/qmltest/axis3d/tst_value.qml29
-rw-r--r--tests/auto/qmltest/bars3d/tst_proxy.qml29
-rw-r--r--tests/auto/qmltest/custom3d/tst_customitem.qml106
-rw-r--r--tests/auto/qmltest/custom3d/tst_customlabel.qml134
-rw-r--r--tests/auto/qmltest/custom3d/tst_customvolume.qml163
-rw-r--r--tests/auto/qmltest/customtexture.jpgbin0 -> 516 bytes
-rw-r--r--tests/auto/qmltest/qmltest.pro16
-rw-r--r--tests/auto/qmltest/qmltest.qrc1
-rw-r--r--tests/auto/qmltest/scatter3d/tst_proxy.qml29
-rw-r--r--tests/auto/qmltest/scene3d/tst_camera.qml29
-rw-r--r--tests/auto/qmltest/scene3d/tst_light.qml29
-rw-r--r--tests/auto/qmltest/scene3d/tst_scene.qml29
-rw-r--r--tests/auto/qmltest/surface3d/tst_proxy.qml29
17 files changed, 682 insertions, 1 deletions
diff --git a/src/datavisualization/data/qcustom3dlabel.cpp b/src/datavisualization/data/qcustom3dlabel.cpp
index 85a37e2d..bb5d71d0 100644
--- a/src/datavisualization/data/qcustom3dlabel.cpp
+++ b/src/datavisualization/data/qcustom3dlabel.cpp
@@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* \since QtDataVisualization 1.1
* \ingroup datavisualization_qml
* \instantiates QCustom3DLabel
+ * \inherits Custom3DItem
* \brief The Custom3DLabel type is for creating custom labels to be added to a graph.
*
* This type is for creating custom labels to be added to a graph. You can set text, font,
diff --git a/src/datavisualization/data/qcustom3dvolume.cpp b/src/datavisualization/data/qcustom3dvolume.cpp
index 563af31a..f8287a81 100644
--- a/src/datavisualization/data/qcustom3dvolume.cpp
+++ b/src/datavisualization/data/qcustom3dvolume.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* \since QtDataVisualization 1.2
* \ingroup datavisualization_qml
* \instantiates QCustom3DVolume
+ * \inherits Custom3DItem
* \brief The Custom3DVolume type is for creating volume rendered objects to be added to a graph.
*
* This class is for creating volume rendered objects to be added to a graph. A volume rendered
diff --git a/tests/auto/qmltest/axis3d/tst_category.qml b/tests/auto/qmltest/axis3d/tst_category.qml
new file mode 100644
index 00000000..98e1779f
--- /dev/null
+++ b/tests/auto/qmltest/axis3d/tst_category.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for CategoryAxis3D
+}
diff --git a/tests/auto/qmltest/axis3d/tst_logvalue.qml b/tests/auto/qmltest/axis3d/tst_logvalue.qml
new file mode 100644
index 00000000..7c6dc83c
--- /dev/null
+++ b/tests/auto/qmltest/axis3d/tst_logvalue.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for LogValueAxis3DFormatter
+}
diff --git a/tests/auto/qmltest/axis3d/tst_value.qml b/tests/auto/qmltest/axis3d/tst_value.qml
new file mode 100644
index 00000000..fa70608b
--- /dev/null
+++ b/tests/auto/qmltest/axis3d/tst_value.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for ValueAxis3D
+}
diff --git a/tests/auto/qmltest/bars3d/tst_proxy.qml b/tests/auto/qmltest/bars3d/tst_proxy.qml
new file mode 100644
index 00000000..7c117ce4
--- /dev/null
+++ b/tests/auto/qmltest/bars3d/tst_proxy.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for ItemModelBarDataProxy
+}
diff --git a/tests/auto/qmltest/custom3d/tst_customitem.qml b/tests/auto/qmltest/custom3d/tst_customitem.qml
new file mode 100644
index 00000000..ee3d10fc
--- /dev/null
+++ b/tests/auto/qmltest/custom3d/tst_customitem.qml
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ width: 150
+ height: 150
+
+ Custom3DItem {
+ id: initial
+ }
+
+ Custom3DItem {
+ id: initialized
+ meshFile: ":\customitem.obj"
+ position: Qt.vector3d(1.0, 0.5, 1.0)
+ positionAbsolute: true
+ rotation: Qt.quaternion(1, 0.5, 0, 0)
+ scaling: Qt.vector3d(0.2, 0.2, 0.2)
+ scalingAbsolute: false
+ shadowCasting: false
+ textureFile: ":\customtexture.jpg"
+ visible: false
+ }
+
+ Custom3DItem {
+ id: change
+ }
+
+ TestCase {
+ name: "Custom3DItem Initial"
+
+ function test_initial() {
+ compare(initial.meshFile, "")
+ compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0))
+ compare(initial.positionAbsolute, false)
+ compare(initial.rotation, Qt.quaternion(0, 0, 0, 0))
+ compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1))
+ compare(initial.scalingAbsolute, true)
+ compare(initial.shadowCasting, true)
+ compare(initial.textureFile, "")
+ compare(initial.visible, true)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DItem Initialized"
+
+ function test_initialized() {
+ compare(initialized.meshFile, ":\customitem.obj")
+ compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(initialized.positionAbsolute, true)
+ compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(initialized.scalingAbsolute, false)
+ compare(initialized.shadowCasting, false)
+ compare(initialized.textureFile, ":\customtexture.jpg")
+ compare(initialized.visible, false)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DItem Change"
+
+ function test_change() {
+ change.meshFile = ":\customitem.obj"
+ change.position = Qt.vector3d(1.0, 0.5, 1.0)
+ change.positionAbsolute = true
+ change.rotation = Qt.quaternion(1, 0.5, 0, 0)
+ change.scaling = Qt.vector3d(0.2, 0.2, 0.2)
+ change.scalingAbsolute = false
+ change.shadowCasting = false
+ change.textureFile = ":\customtexture.jpg"
+ change.visible = false
+
+ compare(change.meshFile, ":\customitem.obj")
+ compare(change.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(change.positionAbsolute, true)
+ compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(change.scalingAbsolute, false)
+ compare(change.shadowCasting, false)
+ compare(change.textureFile, ":\customtexture.jpg")
+ compare(change.visible, false)
+ }
+ }
+}
diff --git a/tests/auto/qmltest/custom3d/tst_customlabel.qml b/tests/auto/qmltest/custom3d/tst_customlabel.qml
new file mode 100644
index 00000000..acac1b63
--- /dev/null
+++ b/tests/auto/qmltest/custom3d/tst_customlabel.qml
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ width: 150
+ height: 150
+
+ Custom3DLabel {
+ id: initial
+ }
+
+ Custom3DLabel {
+ id: initialized
+ backgroundColor: "red"
+ backgroundEnabled: false
+ borderEnabled: false
+ facingCamera: true
+ font.family: "Times New Roman"
+ text: "test label"
+ textColor: "blue"
+
+ position: Qt.vector3d(1.0, 0.5, 1.0)
+ positionAbsolute: true
+ rotation: Qt.quaternion(1, 0.5, 0, 0)
+ scaling: Qt.vector3d(0.2, 0.2, 0.2)
+ shadowCasting: true
+ visible: false
+ }
+
+ Custom3DLabel {
+ id: change
+ }
+
+ TestCase {
+ name: "Custom3DLabel Initial"
+
+ function test_initial() {
+ compare(initial.backgroundColor, "#a0a0a4")
+ compare(initial.backgroundEnabled, true)
+ compare(initial.borderEnabled, true)
+ compare(initial.facingCamera, false)
+ compare(initial.font.family, "Arial")
+ compare(initial.text, "")
+ compare(initial.textColor, "#ffffff")
+
+ compare(initial.meshFile, ":/defaultMeshes/plane")
+ compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0))
+ compare(initial.positionAbsolute, false)
+ compare(initial.rotation, Qt.quaternion(0, 0, 0, 0))
+ compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1))
+ compare(initial.scalingAbsolute, true)
+ compare(initial.shadowCasting, false)
+ compare(initial.textureFile, "")
+ compare(initial.visible, true)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DLabel Initialized"
+
+ function test_initialized() {
+ compare(initialized.backgroundColor, "#ff0000")
+ compare(initialized.backgroundEnabled, false)
+ compare(initialized.borderEnabled, false)
+ compare(initialized.facingCamera, true)
+ compare(initialized.font.family, "Times New Roman")
+ compare(initialized.text, "test label")
+ compare(initialized.textColor, "#0000ff")
+
+ compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(initialized.positionAbsolute, true)
+ compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(initialized.shadowCasting, true)
+ compare(initialized.visible, false)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DLabel Change"
+
+ function test_change() {
+ change.backgroundColor = "red"
+ change.backgroundEnabled = false
+ change.borderEnabled = false
+ change.facingCamera = true
+ change.font.family = "Times New Roman"
+ change.text = "test label"
+ change.textColor = "blue"
+
+ change.position = Qt.vector3d(1.0, 0.5, 1.0)
+ change.positionAbsolute = true
+ change.rotation = Qt.quaternion(1, 0.5, 0, 0)
+ change.scaling = Qt.vector3d(0.2, 0.2, 0.2)
+ change.shadowCasting = true
+ change.visible = false
+
+ compare(change.backgroundColor, "#ff0000")
+ compare(change.backgroundEnabled, false)
+ compare(change.borderEnabled, false)
+ compare(change.facingCamera, true)
+ compare(change.font.family, "Times New Roman")
+ compare(change.text, "test label")
+ compare(change.textColor, "#0000ff")
+
+ compare(change.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(change.positionAbsolute, true)
+ compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(change.shadowCasting, true)
+ compare(change.visible, false)
+ }
+ }
+}
diff --git a/tests/auto/qmltest/custom3d/tst_customvolume.qml b/tests/auto/qmltest/custom3d/tst_customvolume.qml
new file mode 100644
index 00000000..89717d5d
--- /dev/null
+++ b/tests/auto/qmltest/custom3d/tst_customvolume.qml
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ width: 150
+ height: 150
+
+ Custom3DVolume {
+ id: initial
+ }
+
+ Custom3DVolume {
+ id: initialized
+ alphaMultiplier: 0.1
+ drawSliceFrames: true
+ drawSlices: true
+ preserveOpacity: false
+ sliceFrameColor: "red"
+ sliceFrameGaps: Qt.vector3d(2.0, 2.0, 2.0)
+ sliceFrameThicknesses: Qt.vector3d(2.0, 2.0, 2.0)
+ sliceFrameWidths: Qt.vector3d(2.0, 2.0, 2.0)
+ sliceIndexX: 0
+ sliceIndexY: 0
+ sliceIndexZ: 0
+ useHighDefShader: false
+
+ position: Qt.vector3d(1.0, 0.5, 1.0)
+ positionAbsolute: true
+ rotation: Qt.quaternion(1, 0.5, 0, 0)
+ scaling: Qt.vector3d(0.2, 0.2, 0.2)
+ scalingAbsolute: false
+ shadowCasting: false
+ visible: false
+ }
+
+ Custom3DVolume {
+ id: change
+ }
+
+ TestCase {
+ name: "Custom3DVolume Initial"
+
+ function test_initial() {
+ compare(initial.alphaMultiplier, 1.0)
+ compare(initial.drawSliceFrames, false)
+ compare(initial.drawSlices, false)
+ compare(initial.preserveOpacity, true)
+ compare(initial.sliceFrameColor, "#000000")
+ compare(initial.sliceFrameGaps, Qt.vector3d(0.01, 0.01, 0.01))
+ compare(initial.sliceFrameThicknesses, Qt.vector3d(0.01, 0.01, 0.01))
+ compare(initial.sliceFrameWidths, Qt.vector3d(0.01, 0.01, 0.01))
+ compare(initial.sliceIndexX, -1)
+ compare(initial.sliceIndexY, -1)
+ compare(initial.sliceIndexZ, -1)
+ compare(initial.useHighDefShader, true)
+
+ compare(initial.meshFile, ":/defaultMeshes/barFull")
+ compare(initial.position, Qt.vector3d(0.0, 0.0, 0.0))
+ compare(initial.positionAbsolute, false)
+ compare(initial.rotation, Qt.quaternion(0, 0, 0, 0))
+ compare(initial.scaling, Qt.vector3d(0.1, 0.1, 0.1))
+ compare(initial.scalingAbsolute, true)
+ compare(initial.shadowCasting, true)
+ compare(initial.textureFile, "")
+ compare(initial.visible, true)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DVolume Initialized"
+
+ function test_initialized() {
+ compare(initialized.alphaMultiplier, 0.1)
+ compare(initialized.drawSliceFrames, true)
+ compare(initialized.drawSlices, true)
+ compare(initialized.preserveOpacity, false)
+ compare(initialized.sliceFrameColor, "#ff0000")
+ compare(initialized.sliceFrameGaps, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(initialized.sliceFrameThicknesses, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(initialized.sliceFrameWidths, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(initialized.sliceIndexX, 0)
+ compare(initialized.sliceIndexY, 0)
+ compare(initialized.sliceIndexZ, 0)
+ compare(initialized.useHighDefShader, false)
+
+ compare(initialized.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(initialized.positionAbsolute, true)
+ compare(initialized.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(initialized.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(initialized.scalingAbsolute, false)
+ compare(initialized.shadowCasting, false)
+ compare(initialized.visible, false)
+ }
+ }
+
+ TestCase {
+ name: "Custom3DVolume Change"
+
+ function test_change() {
+ change.alphaMultiplier = 0.1
+ change.drawSliceFrames = true
+ change.drawSlices = true
+ change.preserveOpacity = false
+ change.sliceFrameColor = "red"
+ change.sliceFrameGaps = Qt.vector3d(2.0, 2.0, 2.0)
+ change.sliceFrameThicknesses = Qt.vector3d(2.0, 2.0, 2.0)
+ change.sliceFrameWidths = Qt.vector3d(2.0, 2.0, 2.0)
+ change.sliceIndexX = 0
+ change.sliceIndexY = 0
+ change.sliceIndexZ = 0
+ change.useHighDefShader = false
+
+ change.position = Qt.vector3d(1.0, 0.5, 1.0)
+ change.positionAbsolute = true
+ change.rotation = Qt.quaternion(1, 0.5, 0, 0)
+ change.scaling = Qt.vector3d(0.2, 0.2, 0.2)
+ change.scalingAbsolute = false
+ change.shadowCasting = false
+ change.visible = false
+
+ compare(change.alphaMultiplier, 0.1)
+ compare(change.drawSliceFrames, true)
+ compare(change.drawSlices, true)
+ compare(change.preserveOpacity, false)
+ compare(change.sliceFrameColor, "#ff0000")
+ compare(change.sliceFrameGaps, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(change.sliceFrameThicknesses, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(change.sliceFrameWidths, Qt.vector3d(2.0, 2.0, 2.0))
+ compare(change.sliceIndexX, 0)
+ compare(change.sliceIndexY, 0)
+ compare(change.sliceIndexZ, 0)
+ compare(change.useHighDefShader, false)
+
+ compare(change.position, Qt.vector3d(1.0, 0.5, 1.0))
+ compare(change.positionAbsolute, true)
+ compare(change.rotation, Qt.quaternion(1, 0.5, 0, 0))
+ compare(change.scaling, Qt.vector3d(0.2, 0.2, 0.2))
+ compare(change.scalingAbsolute, false)
+ compare(change.shadowCasting, false)
+ compare(change.visible, false)
+ }
+ }
+}
diff --git a/tests/auto/qmltest/customtexture.jpg b/tests/auto/qmltest/customtexture.jpg
new file mode 100644
index 00000000..2580f5bd
--- /dev/null
+++ b/tests/auto/qmltest/customtexture.jpg
Binary files differ
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index ea869a2e..69d39def 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -6,15 +6,29 @@ SOURCES += tst_qmltest.cpp
OTHER_FILES += bars3d\tst_basic.qml \
bars3d\tst_bars.qml \
bars3d\tst_barseries.qml \
+ #bars3d\tst_proxy.qml \
scatter3d\tst_basic.qml \
scatter3d\tst_scatter.qml \
scatter3d\tst_scatterseries.qml \
+ #scatter3d\tst_proxy.qml \
surface3d\tst_basic.qml \
surface3d\tst_surface.qml \
surface3d\tst_surfaceseries.qml \
+ #surface3d\tst_proxy.qml \
theme3d\tst_theme.qml \
theme3d\tst_colorgradient.qml \
- theme3d\tst_themecolor.qml
+ theme3d\tst_themecolor.qml \
+ custom3d\tst_customitem.qml \
+ custom3d\tst_customlabel.qml \
+ custom3d\tst_customvolume.qml #\
+# scene3d\tst_scene.qml \
+# scene3d\tst_camera.qml \
+# scene3d\tst_light.qml \
+# axis3d\tst_category.qml \
+# axis3d\tst_value.qml \
+# axis3d\tst_logvalue.qml
+
+# TODO: Check new QML types (and properties) in 1.2 (only customvolume added for now)
RESOURCES += \
qmltest.qrc
diff --git a/tests/auto/qmltest/qmltest.qrc b/tests/auto/qmltest/qmltest.qrc
index 69def7f8..61f19086 100644
--- a/tests/auto/qmltest/qmltest.qrc
+++ b/tests/auto/qmltest/qmltest.qrc
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<file>customitem.obj</file>
+ <file>customtexture.jpg</file>
</qresource>
</RCC>
diff --git a/tests/auto/qmltest/scatter3d/tst_proxy.qml b/tests/auto/qmltest/scatter3d/tst_proxy.qml
new file mode 100644
index 00000000..4476bf68
--- /dev/null
+++ b/tests/auto/qmltest/scatter3d/tst_proxy.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for ItemModelScatterDataProxy
+}
diff --git a/tests/auto/qmltest/scene3d/tst_camera.qml b/tests/auto/qmltest/scene3d/tst_camera.qml
new file mode 100644
index 00000000..560f5583
--- /dev/null
+++ b/tests/auto/qmltest/scene3d/tst_camera.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for Camera3D
+}
diff --git a/tests/auto/qmltest/scene3d/tst_light.qml b/tests/auto/qmltest/scene3d/tst_light.qml
new file mode 100644
index 00000000..55a18a56
--- /dev/null
+++ b/tests/auto/qmltest/scene3d/tst_light.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for Light3D
+}
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml
new file mode 100644
index 00000000..348ae646
--- /dev/null
+++ b/tests/auto/qmltest/scene3d/tst_scene.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for Scene3D
+}
diff --git a/tests/auto/qmltest/surface3d/tst_proxy.qml b/tests/auto/qmltest/surface3d/tst_proxy.qml
new file mode 100644
index 00000000..25753a3f
--- /dev/null
+++ b/tests/auto/qmltest/surface3d/tst_proxy.qml
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.2
+import QtTest 1.0
+
+Item {
+ id: top
+ height: 150
+ width: 150
+
+ // TODO: Add tests for ItemModelSurfaceDataProxy and HeightMapSurfaceDataProxy
+}