diff options
| author | Zheng Liu (George) <zheng.g.liu@nokia.com> | 2012-02-20 08:48:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 09:23:33 +0100 |
| commit | 1229be63dd4d3705c9d3c898b7facc02fdba42ad (patch) | |
| tree | 886c6f7c8cdcc3f7f719b392cff321b6a117b193 | |
| parent | 7011316f16c3563d79f7c7e90999c27c9978c4e8 (diff) | |
| download | qt3d-1229be63dd4d3705c9d3c898b7facc02fdba42ad.tar.gz | |
fixed qml3d tests
to make qml3d tests run on linux system
Change-Id: I0dc03e959c30a33cceef809d26ddefc484923d10
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml | 1 | ||||
| -rw-r--r-- | tests/auto/qml3d/modelview/tst_modelview.qml | 8 | ||||
| -rw-r--r-- | tests/auto/qml3d/picking/tst_picking.qml | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index a1653fbca..0154731ed 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS = threed -# SUBDIRS += qml3d +SUBDIRS += qml3d diff --git a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml index 615039ff0..b9f24b72d 100644 --- a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml +++ b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml @@ -40,6 +40,7 @@ ****************************************************************************/ import Qt3D 1.0 +import QtQuick 2.0 Viewport { width: 1000 diff --git a/tests/auto/qml3d/modelview/tst_modelview.qml b/tests/auto/qml3d/modelview/tst_modelview.qml index 78f632443..619e81822 100644 --- a/tests/auto/qml3d/modelview/tst_modelview.qml +++ b/tests/auto/qml3d/modelview/tst_modelview.qml @@ -105,10 +105,10 @@ Rectangle Component { id: paneComponentstringList Quad { - property real layer: index - property variant image : modelData - position: Qt.vector3d(0, 0, -layer) - effect: Effect { decal: true; texture: image } + property real qlayer: index + property variant qimage : modelData + position: Qt.vector3d(0, 0, -qlayer) + effect: Effect { decal: true; texture: qimage } transform: Rotation3D { axis: Qt.vector3d(1,0,0); angle: 90 } } } diff --git a/tests/auto/qml3d/picking/tst_picking.qml b/tests/auto/qml3d/picking/tst_picking.qml index 6539f85b0..0b34c9a29 100644 --- a/tests/auto/qml3d/picking/tst_picking.qml +++ b/tests/auto/qml3d/picking/tst_picking.qml @@ -41,7 +41,8 @@ import Qt3D 1.0 import Qt3D.Shapes 1.0 -import QtQuickTest 1.0 +import QtTest 1.0 +import QtQuick 2.0 Rectangle { |