diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /tests/auto/qmltest/qmltest.pro | |
parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'tests/auto/qmltest/qmltest.pro')
-rw-r--r-- | tests/auto/qmltest/qmltest.pro | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro new file mode 100644 index 00000000..cbb9b8b8 --- /dev/null +++ b/tests/auto/qmltest/qmltest.pro @@ -0,0 +1,35 @@ +TEMPLATE = app +TARGET = tst_qmltest +CONFIG += qmltestcase +CONFIG += console +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 \ + surface3d\tst_heightproxy.qml \ + theme3d\tst_theme.qml \ + theme3d\tst_colorgradient.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 \ + input3d\tst_input.qml \ + input3d\tst_touch.qml \ + axis3d\tst_category.qml \ + axis3d\tst_value.qml \ + axis3d\tst_logvalue.qml \ + +RESOURCES += \ + qmltest.qrc |