aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/animation
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-07-18 13:53:40 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-28 01:51:19 +0200
commit3912bbaceab166eb116447311eb16453e4f26edf (patch)
treeb44561b4fbded41d7011e79c3d9a5411a1de438c /examples/quick/animation
parentc2f2ae8ce90e621cc3835428c40c116fbdc593e6 (diff)
Update usage of smooth and antialiasing.
Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'examples/quick/animation')
-rw-r--r--examples/quick/animation/easing/content/QuitButton.qml52
-rw-r--r--examples/quick/animation/easing/content/quit.pngbin583 -> 0 bytes
-rw-r--r--examples/quick/animation/easing/easing.qml7
-rw-r--r--examples/quick/animation/pathanimation/pathanimation.qml4
-rw-r--r--examples/quick/animation/pathinterpolator/pathinterpolator.qml4
5 files changed, 7 insertions, 60 deletions
diff --git a/examples/quick/animation/easing/content/QuitButton.qml b/examples/quick/animation/easing/content/QuitButton.qml
deleted file mode 100644
index 702b892d23..0000000000
--- a/examples/quick/animation/easing/content/QuitButton.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-Image {
- source: "quit.png"
- scale: quitMouse.pressed ? 0.8 : 1.0
- smooth: quitMouse.pressed
- MouseArea {
- id: quitMouse
- anchors.fill: parent
- anchors.margins: -10
- onClicked: Qt.quit()
- }
-}
diff --git a/examples/quick/animation/easing/content/quit.png b/examples/quick/animation/easing/content/quit.png
deleted file mode 100644
index b822057d4e..0000000000
--- a/examples/quick/animation/easing/content/quit.png
+++ /dev/null
Binary files differ
diff --git a/examples/quick/animation/easing/easing.qml b/examples/quick/animation/easing/easing.qml
index 8977029fb3..0d7d8c347b 100644
--- a/examples/quick/animation/easing/easing.qml
+++ b/examples/quick/animation/easing/easing.qml
@@ -39,7 +39,6 @@
****************************************************************************/
import QtQuick 2.0
-import "content"
Rectangle {
id: window
@@ -104,20 +103,20 @@ Rectangle {
Rectangle {
id: slot1; color: "#121212"; x: 30; height: 46; width: 46
- border.color: "#343434"; border.width: 1; radius: 12
+ border.color: "#343434"; border.width: 1; radius: 12; antialiasing: true
anchors.verticalCenter: parent.verticalCenter
}
Rectangle {
id: slot2; color: "#121212"; x: window.width - 76; height: 46; width: 46
- border.color: "#343434"; border.width: 1; radius: 12
+ border.color: "#343434"; border.width: 1; radius: 12; antialiasing: true
anchors.verticalCenter: parent.verticalCenter
}
Rectangle {
id: rect; x: 30; color: "#454545"
border.color: "White"; border.width: 2
- height: 46; width: 46; radius: 12
+ height: 46; width: 46; radius: 12; antialiasing: true
anchors.verticalCenter: parent.verticalCenter
MouseArea {
diff --git a/examples/quick/animation/pathanimation/pathanimation.qml b/examples/quick/animation/pathanimation/pathanimation.qml
index 06c0b86970..5726a0acca 100644
--- a/examples/quick/animation/pathanimation/pathanimation.qml
+++ b/examples/quick/animation/pathanimation/pathanimation.qml
@@ -48,7 +48,7 @@ Rectangle {
Canvas {
id: canvas
anchors.fill: parent
- smooth: true
+ antialiasing: true
onPaint: {
var context = canvas.getContext("2d")
@@ -97,7 +97,7 @@ Rectangle {
x: 25; y: 25
width: 50; height: 50
border.width: 1
- smooth: true
+ antialiasing: true
Text {
anchors.centerIn: parent
diff --git a/examples/quick/animation/pathinterpolator/pathinterpolator.qml b/examples/quick/animation/pathinterpolator/pathinterpolator.qml
index 6813966015..83aead8e7e 100644
--- a/examples/quick/animation/pathinterpolator/pathinterpolator.qml
+++ b/examples/quick/animation/pathinterpolator/pathinterpolator.qml
@@ -48,7 +48,7 @@ Rectangle {
Canvas {
id: canvas
anchors.fill: parent
- smooth: true
+ antialiasing: true
onPaint: {
var context = canvas.getContext("2d")
@@ -97,7 +97,7 @@ Rectangle {
width: 50; height: 50
border.width: 1
- smooth: true
+ antialiasing: true
//bind our attributes to follow the path as progress changes
x: motionPath.x