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>

7 files changed, 15 insertions, 71 deletions

diff --git a/examples/demos/clocks/content/Clock.qml b/examples/demos/clocks/content/Clock.qml
index 7f0e8cba83..9c539637a5 100644
--- a/examples/demos/clocks/content/Clock.qml
+++ b/examples/demos/clocks/content/Clock.qml
@@ -88,7 +88,6 @@ Item {
         Image {
             x: 92.5; y: 27
             source: "hour.png"
-            smooth: true
             transform: Rotation {
                 id: hourRotation
                 origin.x: 7.5; origin.y: 73;
@@ -102,7 +101,6 @@ Item {
         Image {
             x: 93.5; y: 17
             source: "minute.png"
-            smooth: true
             transform: Rotation {
                 id: minuteRotation
                 origin.x: 6.5; origin.y: 83;
@@ -116,7 +114,6 @@ Item {
         Image {
             x: 97.5; y: 20
             source: "second.png"
-            smooth: true
             transform: Rotation {
                 id: secondRotation
                 origin.x: 2.5; origin.y: 80;
diff --git a/examples/demos/clocks/content/QuitButton.qml b/examples/demos/clocks/content/QuitButton.qml
deleted file mode 100644
index 702b892d23..0000000000
--- a/examples/demos/clocks/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/demos/maroon/content/GameOverScreen.qml b/examples/demos/maroon/content/GameOverScreen.qml
index 343bd7aba6..e997b0b93c 100644
--- a/examples/demos/maroon/content/GameOverScreen.qml
+++ b/examples/demos/maroon/content/GameOverScreen.qml
@@ -61,7 +61,6 @@ Item {
             source: "gfx/cloud.png"
             alphaVariation: 0.25
             opacity: 0.25
-            smooth: true
         }
 
         Wander {
diff --git a/examples/demos/maroon/maroon.qml b/examples/demos/maroon/maroon.qml
index 9511a0f06f..9700da8366 100644
--- a/examples/demos/maroon/maroon.qml
+++ b/examples/demos/maroon/maroon.qml
@@ -63,7 +63,6 @@ Item {
                 anchors.fill: parent
                 source: "content/gfx/catch.png"
                 opacity: 0.25
-                smooth: true
             }
 
             Wander {
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
index 8f4177c097..ae4e40a0c9 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
@@ -52,18 +52,18 @@ Item {
 
     BorderImage {
         anchors { fill: container; leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8 }
-        source: 'images/box-shadow.png'; smooth: true
+        source: 'images/box-shadow.png'
         border.left: 10; border.top: 10; border.right: 10; border.bottom: 10
     }
 
-    Image { anchors.fill: parent; source: "images/cardboard.png"; smooth: true }
+    Image { anchors.fill: parent; source: "images/cardboard.png"; antialiasing: true }
 
     Rectangle {
         anchors.fill: container; color: container.tint; visible: container.tint != ""
-        opacity: 0.25; smooth: true
+        opacity: 0.25
     }
 
-    Text { id: labelText; font.pixelSize: 15; anchors.centerIn: parent; smooth: true }
+    Text { id: labelText; font.pixelSize: 15; anchors.centerIn: parent }
 
     MouseArea {
         anchors { fill: parent; leftMargin: -20; topMargin: -20; rightMargin: -20; bottomMargin: -20 }
diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
index 9d08de575f..426e5d6023 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -51,14 +51,14 @@ Item {
 
     BorderImage {
         anchors { fill: container; leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8 }
-        source: 'images/box-shadow.png'; smooth: true
+        source: 'images/box-shadow.png';
         border.left: 10; border.top: 10; border.right: 10; border.bottom: 10
     }
 
-    Image { anchors.fill: parent; source: "images/cardboard.png"; smooth: true }
+    Image { anchors.fill: parent; source: "images/cardboard.png"; antialiasing: true }
 
     TextInput {
-        id: textInput; text: label; font.pixelSize: 15; anchors.centerIn: parent; smooth: true
+        id: textInput; text: label; font.pixelSize: 15; anchors.centerIn: parent
         Keys.onReturnPressed: {
             container.label = textInput.text
             container.focus = true
@@ -75,7 +75,7 @@ Item {
 
     Rectangle {
         anchors.fill: container; border.color: "steelblue"; border.width: 4
-        color: "transparent"; visible: textInput.focus; smooth: true
+        color: "transparent"; visible: textInput.focus; antialiasing: true
     }
 
     MouseArea {
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 5d4e5aee5d..b7b1963f61 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -64,7 +64,7 @@ Package {
                     fill: originalImage.status == Image.Ready ? border : placeHolder
                     leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8
                 }
-                source: 'images/box-shadow.png'; smooth: true
+                source: 'images/box-shadow.png'
                 border.left: 10; border.top: 10; border.right: 10; border.bottom: 10
             }
             Rectangle {
@@ -74,25 +74,26 @@ Package {
                 property int h: Script.getHeight(content)
                 property double s: Script.calculateScale(w, h, photoWrapper.width)
 
-                color: 'white'; anchors.centerIn: parent; smooth: true
+                color: 'white'; anchors.centerIn: parent; antialiasing: true
                 width:  w * s; height: h * s; visible: originalImage.status != Image.Ready
                 Rectangle {
-                    color: "#878787"; smooth: true
+                    color: "#878787"; antialiasing: true
                     anchors { fill: parent; topMargin: 3; bottomMargin: 3; leftMargin: 3; rightMargin: 3 }
                 }
             }
             Rectangle {
-                id: border; color: 'white'; anchors.centerIn: parent; smooth: true
+                id: border; color: 'white'; anchors.centerIn: parent; antialiasing: true
                 width: originalImage.paintedWidth + 6; height: originalImage.paintedHeight + 6
                 visible: !placeHolder.visible
             }
             BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
-                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content); cache: false
+                id: originalImage; antialiasing: true;
+                source: "http://" + Script.getImagePath(content); cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Image {
-                id: hqImage; smooth: true; source: ""; visible: false; cache: false
+                id: hqImage; antialiasing: true; source: ""; visible: false; cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Binding {