summaryrefslogtreecommitdiffstats
path: root/tests/qmlcamera
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-05-28 13:49:15 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-28 13:51:16 +0300
commitf1d7a4679711734b74538be649567d0826278920 (patch)
tree07b5ad29f36079c3e2eea84abc9de2ec59571119 /tests/qmlcamera
parentbda4432c80fd340a3d75ba077830ed93724fd9f1 (diff)
Added CustomLabelItem
Task-number: QTRD-3135 Change-Id: Ie13c7ab5cbfca2eef88ed4ca17eaf46f2aeb4788 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/qmlcamera')
-rw-r--r--tests/qmlcamera/qml/qmlcamera/main.qml11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index c357accf..444e175c 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -67,7 +67,7 @@ Rectangle {
scene.activeCamera.zoomLevel: zoomSlider.value
inputHandler: null
- customItemList: [shuttleItem]
+ customItemList: [shuttleItem, labelItem]
}
Custom3DItem {
@@ -78,6 +78,15 @@ Rectangle {
scaling: Qt.vector3d(0.2,0.2,0.2)
}
+ Custom3DLabel {
+ id: labelItem
+ facingCamera: true
+ positionAbsolute: true
+ position: Qt.vector3d(0.0,1.5,0.0)
+ scaling: Qt.vector3d(1.0,1.0,1.0)
+ text: "Qt Shuttle"
+ }
+
MouseArea {
id: inputArea
anchors.fill: parent