summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest/qmltest.pro
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-10-15 09:42:33 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-10-15 09:51:10 +0300
commit733bff1b086e182dba5f9713fefa8995852f0c0e (patch)
treee175e96b978907f811b75b33d1e2caa138a4d7c0 /tests/auto/qmltest/qmltest.pro
parentc5d9c5c1973408f0233c9f257a80b484585079c0 (diff)
Added tests for QML custom items
Also added skeleton for remaining QML tests and some inheritance updates to documentation. Task-number: QTRD-3368 Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Change-Id: I28cb52c4738953b7f281ce91a3764f849643d35a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'tests/auto/qmltest/qmltest.pro')
-rw-r--r--tests/auto/qmltest/qmltest.pro16
1 files changed, 15 insertions, 1 deletions
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