diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-20 12:03:59 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-20 12:05:37 +0200 |
| commit | eb3d0514ca886db33776522ea00f27b69bc86ad1 (patch) | |
| tree | 3439287f6a70f681c5c9a08c77ec1b4342a24768 /examples/qmlcustominput/qml/qmlcustominput/main.qml | |
| parent | 07aba602fc82ac31684988f8e8e22521d2b3c982 (diff) | |
| parent | e895c5085f6097983bdd617c39ea5184541d6c4d (diff) | |
Merge branch 'develop'
Change-Id: I7408ac3b14c3a9484d28f8c08eece6210a44025e
Diffstat (limited to 'examples/qmlcustominput/qml/qmlcustominput/main.qml')
| -rw-r--r-- | examples/qmlcustominput/qml/qmlcustominput/main.qml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/qmlcustominput/qml/qmlcustominput/main.qml index f777fd6b..54ec3342 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/main.qml +++ b/examples/qmlcustominput/qml/qmlcustominput/main.qml @@ -25,7 +25,6 @@ Item { id: mainView width: 1280 height: 720 - visible: true Data { id: graphData @@ -182,7 +181,7 @@ Item { id: cameraToggle Layout.fillHeight: true Layout.minimumWidth: parent.width / 3 - text: "Animate Camera" + text: "Pause Camera" onClicked: { cameraAnimationX.paused = !cameraAnimationX.paused; |