From: Michael Brasser Date: Wed, 18 Jul 2012 03:53:40 +0000 (+1000) Subject: Update usage of smooth and antialiasing. X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3912bbaceab166eb116447311eb16453e4f26edf;p=konrad%2Fqtdeclarative.git Update usage of smooth and antialiasing. Change-Id: Icc8b28bdd466389ed3f269f076f1bdb6e9abe3f2 Reviewed-by: Yunqiao Yin Reviewed-by: Bea Lam --- diff --git a/examples/demos/clocks/content/Clock.qml b/examples/demos/clocks/content/Clock.qml index 7f0e8cb..9c53963 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 702b892..0000000 --- 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 343bd7a..e997b0b 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 9511a0f..9700da8 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 8f4177c..ae4e40a 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 9d08de5..426e5d6 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 5d4e5ae..b7b1963 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 { diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/particles/affectors/content/spritegoal.qml index 0e5d94c..b45807f 100644 --- a/examples/particles/affectors/content/spritegoal.qml +++ b/examples/particles/affectors/content/spritegoal.qml @@ -55,7 +55,6 @@ Item { source: "../../images/finalfrontier.png" transformOrigin: Item.Center anchors.centerIn: parent - smooth: true NumberAnimation on rotation { from: 0 to: 360 @@ -137,7 +136,6 @@ Item { Image { id: rocketShip source: "../../images/rocket.png" - smooth: true anchors.centerIn: holder rotation: (circle.percent+0.25) * 360 z: 2 diff --git a/examples/particles/customparticle/content/blurparticles.qml b/examples/particles/customparticle/content/blurparticles.qml index c1ad03b..3d08dfc 100644 --- a/examples/particles/customparticle/content/blurparticles.qml +++ b/examples/particles/customparticle/content/blurparticles.qml @@ -87,13 +87,11 @@ Rectangle { //! [vertex] property variant source: theSource property variant blurred: ShaderEffectSource { - smooth: true sourceItem: ShaderEffect { width: theItem.width height: theItem.height property variant delta: Qt.size(0.0, 1.0 / height) property variant source: ShaderEffectSource { - smooth: true sourceItem: ShaderEffect { width: theItem.width height: theItem.height diff --git a/examples/particles/itemparticle/content/ExpandingDelegate.qml b/examples/particles/itemparticle/content/ExpandingDelegate.qml index 87f723d..ab565f7 100644 --- a/examples/particles/itemparticle/content/ExpandingDelegate.qml +++ b/examples/particles/itemparticle/content/ExpandingDelegate.qml @@ -68,6 +68,7 @@ import "../../../modelviews/listview/content" color: "ivory" border.color: "orange" radius: 5 + antialiasing: true } Image { anchors.fill:parent diff --git a/examples/particles/itemparticle/particleview.qml b/examples/particles/itemparticle/particleview.qml index 1679c01..94b7899 100644 --- a/examples/particles/itemparticle/particleview.qml +++ b/examples/particles/itemparticle/particleview.qml @@ -200,6 +200,7 @@ Item { Rectangle { id: container border.width: 2 + antialiasing: true property real myRand: Math.random();//'depth' z: Math.floor(myRand * 100) scale: (myRand + 1.0)/2; @@ -221,7 +222,8 @@ Item { Image { id: img anchors.centerIn: parent - smooth: true; source: "http://" + Script.getImagePath(content); cache: true + antialiasing: true; + source: "http://" + Script.getImagePath(content); cache: true fillMode: Image.PreserveAspectFit; width: parent.width-4; height: parent.height-4 onStatusChanged: if (img.status == Image.Ready) { diff --git a/examples/qml/dynamicscene/content/Button.qml b/examples/qml/dynamicscene/content/Button.qml index ba7db50..c299f19 100644 --- a/examples/qml/dynamicscene/content/Button.qml +++ b/examples/qml/dynamicscene/content/Button.qml @@ -49,7 +49,7 @@ Rectangle { height: text.height + 10; width: text.width + 20 border.width: 1 radius: 4 - smooth: true + antialiasing: true gradient: Gradient { GradientStop { diff --git a/examples/qml/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/content/PerspectiveItem.qml index f651369..fa8646b 100644 --- a/examples/qml/dynamicscene/content/PerspectiveItem.qml +++ b/examples/qml/dynamicscene/content/PerspectiveItem.qml @@ -52,7 +52,6 @@ Image { source: image opacity: onLand ? 1 : 0.25 scale: Math.max((y + height - 250) * 0.01, 0.3) - smooth: true onCreatedChanged: { if (created && !onLand) diff --git a/examples/qml/plugins/com/nokia/TimeExample/Clock.qml b/examples/qml/plugins/com/nokia/TimeExample/Clock.qml index eac9226..ee37f88 100644 --- a/examples/qml/plugins/com/nokia/TimeExample/Clock.qml +++ b/examples/qml/plugins/com/nokia/TimeExample/Clock.qml @@ -54,7 +54,6 @@ Rectangle { Image { x: 92.5; y: 27 source: "hour.png" - smooth: true transform: Rotation { id: hourRotation origin.x: 7.5; origin.y: 73; @@ -68,7 +67,6 @@ Rectangle { Image { x: 93.5; y: 17 source: "minute.png" - smooth: true transform: Rotation { id: minuteRotation origin.x: 6.5; origin.y: 83; diff --git a/examples/qml/xmlhttprequest/get.qml b/examples/qml/xmlhttprequest/get.qml index 28ba078..93ff7ba 100644 --- a/examples/qml/xmlhttprequest/get.qml +++ b/examples/qml/xmlhttprequest/get.qml @@ -55,7 +55,7 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter; anchors.bottom: parent.bottom; anchors.margins: 10 width: buttonText.width + 10; height: buttonText.height + 10 border.width: mouseArea.pressed ? 2 : 1 - radius : 5; smooth: true + radius : 5; antialiasing: true Text { id: buttonText; anchors.centerIn: parent; text: "Request data.xml" } diff --git a/examples/quick/accessibility/content/Button.qml b/examples/quick/accessibility/content/Button.qml index f9eb5b4..e1f465d 100644 --- a/examples/quick/accessibility/content/Button.qml +++ b/examples/quick/accessibility/content/Button.qml @@ -66,13 +66,14 @@ Rectangle { border.width: 2 border.color: "black"; radius: 10 + antialiasing: true Text { id: buttonText text: parent.description anchors.centerIn: parent font.pixelSize: parent.height * .5 - style: Text.Sunken; color: "white"; styleColor: "black"; smooth: true + style: Text.Sunken; color: "white"; styleColor: "black" } MouseArea { diff --git a/examples/quick/animation/easing/content/QuitButton.qml b/examples/quick/animation/easing/content/QuitButton.qml deleted file mode 100644 index 702b892..0000000 --- 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 b822057..0000000 Binary files a/examples/quick/animation/easing/content/quit.png and /dev/null differ diff --git a/examples/quick/animation/easing/easing.qml b/examples/quick/animation/easing/easing.qml index 8977029..0d7d8c3 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 06c0b86..5726a0a 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 6813966..83aead8 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 diff --git a/examples/quick/canvas/bezierCurve/bezierCurve.qml b/examples/quick/canvas/bezierCurve/bezierCurve.qml index 6337b12..a071813 100644 --- a/examples/quick/canvas/bezierCurve/bezierCurve.qml +++ b/examples/quick/canvas/bezierCurve/bezierCurve.qml @@ -63,8 +63,7 @@ Item { property real scaleX : scaleXCtrl.value property real scaleY : scaleYCtrl.value property real rotate : rotateCtrl.value - smooth:true - + antialiasing: true Behavior on scaleX { SpringAnimation { spring: 2; damping: 0.2; loops:Animation.Infinite } } Behavior on scaleY { SpringAnimation { spring: 2; damping: 0.2; loops:Animation.Infinite} } diff --git a/examples/quick/canvas/clip/clip.qml b/examples/quick/canvas/clip/clip.qml index 55c7913..c500c31 100644 --- a/examples/quick/canvas/clip/clip.qml +++ b/examples/quick/canvas/clip/clip.qml @@ -64,7 +64,7 @@ Item { property real py:yCtrl.value property real alpha:alphaCtrl.value property string imagefile:"../contents/qt-logo.png" - smooth:true + antialiasing: true Component.onCompleted:loadImage(canvas.imagefile); onAlphaChanged:requestPaint(); diff --git a/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml index e7121c1..59a2eeb 100644 --- a/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml +++ b/examples/quick/canvas/quadraticCurveTo/quadraticCurveTo.qml @@ -63,7 +63,7 @@ Item { property real scaleX : scaleXCtrl.value property real scaleY : scaleYCtrl.value property real rotate : rotateCtrl.value - smooth:true + antialiasing: true onLineWidthChanged:requestPaint(); onFillChanged:requestPaint(); diff --git a/examples/quick/canvas/roundedrect/roundedrect.qml b/examples/quick/canvas/roundedrect/roundedrect.qml index 568b387..8388209 100644 --- a/examples/quick/canvas/roundedrect/roundedrect.qml +++ b/examples/quick/canvas/roundedrect/roundedrect.qml @@ -53,7 +53,7 @@ Item { id:canvas width:320 height:280 - smooth:true + antialiasing: true property int radius: rCtrl.value property int rectx: rxCtrl.value diff --git a/examples/quick/canvas/smile/smile.qml b/examples/quick/canvas/smile/smile.qml index 00ded93..43265f9 100644 --- a/examples/quick/canvas/smile/smile.qml +++ b/examples/quick/canvas/smile/smile.qml @@ -54,7 +54,7 @@ Item { id:canvas width:320 height:280 - smooth:true + antialiasing: true property string strokeStyle:"green" property string fillStyle:"yellow" diff --git a/examples/quick/canvas/squircle/squircle.qml b/examples/quick/canvas/squircle/squircle.qml index a102dc4..4bcbf60 100644 --- a/examples/quick/canvas/squircle/squircle.qml +++ b/examples/quick/canvas/squircle/squircle.qml @@ -59,7 +59,7 @@ Item { id:canvas width:320 height:250 - smooth:true + antialiasing: true property string strokeStyle:"blue" property string fillStyle:"steelblue" diff --git a/examples/quick/canvas/tiger/tiger.qml b/examples/quick/canvas/tiger/tiger.qml index 92fe2fe..a9d291d 100644 --- a/examples/quick/canvas/tiger/tiger.qml +++ b/examples/quick/canvas/tiger/tiger.qml @@ -55,7 +55,7 @@ Item { id:canvas width:320 height:280 - smooth:true + antialiasing: true property string strokeStyle:"steelblue" property string fillStyle:"yellow" property bool fill:true diff --git a/examples/quick/customitems/dialcontrol/content/Dial.qml b/examples/quick/customitems/dialcontrol/content/Dial.qml index c61adee..688bb95 100644 --- a/examples/quick/customitems/dialcontrol/content/Dial.qml +++ b/examples/quick/customitems/dialcontrol/content/Dial.qml @@ -63,7 +63,7 @@ Item { Image { id: needle x: 98; y: 33 - smooth: true + antialiasing: true source: "needle.png" transform: Rotation { id: needleRotation diff --git a/examples/quick/customitems/dialcontrol/content/QuitButton.qml b/examples/quick/customitems/dialcontrol/content/QuitButton.qml index 702b892..3fcdcf8 100644 --- a/examples/quick/customitems/dialcontrol/content/QuitButton.qml +++ b/examples/quick/customitems/dialcontrol/content/QuitButton.qml @@ -42,7 +42,6 @@ import QtQuick 2.0 Image { source: "quit.png" scale: quitMouse.pressed ? 0.8 : 1.0 - smooth: quitMouse.pressed MouseArea { id: quitMouse anchors.fill: parent diff --git a/examples/quick/customitems/dialcontrol/dialcontrol.qml b/examples/quick/customitems/dialcontrol/dialcontrol.qml index 467a558..562a3c6 100644 --- a/examples/quick/customitems/dialcontrol/dialcontrol.qml +++ b/examples/quick/customitems/dialcontrol/dialcontrol.qml @@ -67,7 +67,7 @@ Rectangle { radius: 8 opacity: 0.7 - smooth: true + antialiasing: true gradient: Gradient { GradientStop { position: 0.0; color: "gray" } GradientStop { position: 1.0; color: "white" } @@ -77,7 +77,7 @@ Rectangle { id: slider x: 1; y: 1; width: 30; height: 14 radius: 6 - smooth: true + antialiasing: true gradient: Gradient { GradientStop { position: 0.0; color: "#424242" } GradientStop { position: 1.0; color: "black" } diff --git a/examples/quick/customitems/flipable/content/Card.qml b/examples/quick/customitems/flipable/content/Card.qml index 6006ea1..aad177c 100644 --- a/examples/quick/customitems/flipable/content/Card.qml +++ b/examples/quick/customitems/flipable/content/Card.qml @@ -51,8 +51,8 @@ Flipable { width: front.width; height: front.height - front: Image { id: frontImage; smooth: true } - back: Image { source: "back.png"; smooth: true } + front: Image { id: frontImage } + back: Image { source: "back.png" } state: "back" diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.qml b/examples/quick/customitems/maskedmousearea/maskedmousearea.qml index 82d351b..df4c42f 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.qml +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.qml @@ -58,7 +58,6 @@ Rectangle { Image { id: moon - smooth: true anchors.centerIn: parent scale: moonArea.pressed ? 1.1 : 1.0 opacity: moonArea.containsMouse ? 1.0 : 0.7 @@ -86,7 +85,6 @@ Rectangle { verticalCenterOffset: 30 horizontalCenterOffset: 80 } - smooth: true scale: rightCloudArea.pressed ? 1.1 : 1.0 opacity: rightCloudArea.containsMouse ? 1.0 : 0.7 source: Qt.resolvedUrl("images/cloud_2.png") @@ -113,7 +111,6 @@ Rectangle { verticalCenterOffset: 40 horizontalCenterOffset: -80 } - smooth: true scale: leftCloudArea.pressed ? 1.1 : 1.0 opacity: leftCloudArea.containsMouse ? 1.0 : 0.7 source: Qt.resolvedUrl("images/cloud_1.png") diff --git a/examples/quick/imageelements/content/ImageCell.qml b/examples/quick/imageelements/content/ImageCell.qml index fcc6b47..44242fb 100644 --- a/examples/quick/imageelements/content/ImageCell.qml +++ b/examples/quick/imageelements/content/ImageCell.qml @@ -50,7 +50,6 @@ Item { width: parent.width; height: parent.height - captionItem.height source: "qt-logo.png" clip: true // only makes a difference if mode is PreserveAspectCrop - smooth: true } Text { diff --git a/examples/quick/imageelements/content/ShadowRectangle.qml b/examples/quick/imageelements/content/ShadowRectangle.qml index 4ce8915..ac24f78 100644 --- a/examples/quick/imageelements/content/ShadowRectangle.qml +++ b/examples/quick/imageelements/content/ShadowRectangle.qml @@ -48,7 +48,7 @@ Item { anchors.fill: rectangle anchors { leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8 } border { left: 10; top: 10; right: 10; bottom: 10 } - source: "shadow.png"; smooth: true + source: "shadow.png" } //! [shadow] diff --git a/examples/quick/keyinteraction/focus/Core/GridMenu.qml b/examples/quick/keyinteraction/focus/Core/GridMenu.qml index 75bbe68..40af695 100644 --- a/examples/quick/keyinteraction/focus/Core/GridMenu.qml +++ b/examples/quick/keyinteraction/focus/Core/GridMenu.qml @@ -73,11 +73,11 @@ FocusScope { Rectangle { id: content color: "transparent" - smooth: true + antialiasing: true anchors.fill: parent; anchors.margins: 20; radius: 10 - Rectangle { color: "#91AA9D"; anchors.fill: parent; anchors.margins: 3; radius: 8; smooth: true } - Image { source: "images/qt-logo.png"; anchors.centerIn: parent; smooth: true } + Rectangle { color: "#91AA9D"; anchors.fill: parent; anchors.margins: 3; radius: 8; antialiasing: true } + Image { source: "images/qt-logo.png"; anchors.centerIn: parent } } MouseArea { diff --git a/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml index b28b026..76e9164 100644 --- a/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml +++ b/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml @@ -48,10 +48,10 @@ Item { id: content anchors.centerIn: parent; width: container.width - 40; height: container.height - 10 color: "transparent" - smooth: true + antialiasing: true radius: 10 - Rectangle { anchors.fill: parent; anchors.margins: 3; color: "#91AA9D"; smooth: true; radius: 8 } + Rectangle { anchors.fill: parent; anchors.margins: 3; color: "#91AA9D"; antialiasing: true; radius: 8 } } Text { diff --git a/examples/quick/modelviews/listview/content/TextButton.qml b/examples/quick/modelviews/listview/content/TextButton.qml index 9f0e673..834bc60 100644 --- a/examples/quick/modelviews/listview/content/TextButton.qml +++ b/examples/quick/modelviews/listview/content/TextButton.qml @@ -48,7 +48,7 @@ Rectangle { signal clicked width: label.width + 20; height: label.height + 6 - smooth: true + antialiasing: true radius: 10 gradient: Gradient { diff --git a/examples/quick/modelviews/parallax/content/Clock.qml b/examples/quick/modelviews/parallax/content/Clock.qml index 7f0e8cb..9c53963 100644 --- a/examples/quick/modelviews/parallax/content/Clock.qml +++ b/examples/quick/modelviews/parallax/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/quick/modelviews/parallax/content/ParallaxView.qml b/examples/quick/modelviews/parallax/content/ParallaxView.qml index 2acf50d..8e7f4e4 100644 --- a/examples/quick/modelviews/parallax/content/ParallaxView.qml +++ b/examples/quick/modelviews/parallax/content/ParallaxView.qml @@ -90,7 +90,6 @@ Item { Image { id: image source: modelData.icon - smooth: true scale: 0.8 } diff --git a/examples/quick/modelviews/parallax/content/QuitButton.qml b/examples/quick/modelviews/parallax/content/QuitButton.qml deleted file mode 100644 index 702b892..0000000 --- a/examples/quick/modelviews/parallax/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/modelviews/pathview/pathview-example.qml b/examples/quick/modelviews/pathview/pathview-example.qml index 6161343..7440710 100644 --- a/examples/quick/modelviews/pathview/pathview-example.qml +++ b/examples/quick/modelviews/pathview/pathview-example.qml @@ -65,12 +65,10 @@ Rectangle { id: myIcon y: 20; anchors.horizontalCenter: parent.horizontalCenter source: icon - smooth: true } Text { anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter } text: name - smooth: true } MouseArea { diff --git a/examples/quick/shadereffects/shadereffects.qml b/examples/quick/shadereffects/shadereffects.qml index de221e9..9fdbde9 100644 --- a/examples/quick/shadereffects/shadereffects.qml +++ b/examples/quick/shadereffects/shadereffects.qml @@ -82,7 +82,6 @@ Rectangle { ShaderEffectSource { id: theSource sourceItem: theItem - smooth: true } //! [source] @@ -125,13 +124,11 @@ Rectangle { width: 160 height: 140 source: "content/qt-logo.png" - smooth: true } Image { width: 160 height: 140 source: "content/face-smile.png" - smooth: true } } } @@ -170,13 +167,11 @@ Rectangle { height: 160 property variant source: theSource property variant shadow: ShaderEffectSource { - smooth: true sourceItem: ShaderEffect { width: theItem.width height: theItem.height property variant delta: Qt.size(0.0, 1.0 / height) property variant source: ShaderEffectSource { - smooth: true sourceItem: ShaderEffect { width: theItem.width height: theItem.height diff --git a/examples/quick/text/fonts/hello.qml b/examples/quick/text/fonts/hello.qml index 024895b..7cba151 100644 --- a/examples/quick/text/fonts/hello.qml +++ b/examples/quick/text/fonts/hello.qml @@ -56,7 +56,6 @@ Rectangle { color: "white" text: "Hello world!" font.pixelSize: 32 - smooth: true //! [letterspacing] SequentialAnimation on font.letterSpacing { diff --git a/examples/quick/touchinteraction/flickable/content/Panel.qml b/examples/quick/touchinteraction/flickable/content/Panel.qml index c3cf9e2..e5179c1 100644 --- a/examples/quick/touchinteraction/flickable/content/Panel.qml +++ b/examples/quick/touchinteraction/flickable/content/Panel.qml @@ -91,13 +91,11 @@ Component { x: 8 + -width * 0.6 / 2; y: -20 source: "note-yellow.png" scale: 0.6; transformOrigin: Item.TopLeft - smooth: true } TextEdit { id: myText x: -104; y: 36; width: 215; height: 200 - smooth: true font.pixelSize: 24 readOnly: false rotation: -8 diff --git a/examples/tutorials/gettingStartedQml/core/Button.qml b/examples/tutorials/gettingStartedQml/core/Button.qml index 9ea8c6d..aa93c55 100644 --- a/examples/tutorials/gettingStartedQml/core/Button.qml +++ b/examples/tutorials/gettingStartedQml/core/Button.qml @@ -64,7 +64,7 @@ Rectangle { //set appearance properties radius: 6 - smooth: true + antialiasing: true border { width: 2; color: borderColor } width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/tutorials/gettingStartedQml/core/FileDialog.qml index 0a4341b..76a11d1 100644 --- a/examples/tutorials/gettingStartedQml/core/FileDialog.qml +++ b/examples/tutorials/gettingStartedQml/core/FileDialog.qml @@ -55,6 +55,7 @@ Rectangle { Rectangle { id: dirBox radius: 10 + antialiasing: true anchors.centerIn:parent height: parent.height -15; width: parent.width -30 @@ -62,6 +63,7 @@ Rectangle { id:header height: parent.height*0.1; width: parent.width radius:3 + antialiasing: true z:1 gradient: Gradient { GradientStop { position: 0.0; color: "#8C8F8C" } @@ -110,7 +112,7 @@ Rectangle { width: parent.width; height: parent.height anchors.centerIn: parent radius: 10 - smooth: true + antialiasing: true scale: GridView.view.currentIndex == index ? 1 : 0.5 opacity: GridView.view.currentIndex == index ? 1 : 0 Text { @@ -121,7 +123,6 @@ Rectangle { color: "#696167" font.weight: Font.DemiBold font.pointSize: 12 - smooth: true elide: Text.ElideMiddle horizontalAlignment: Text.AlignHCenter } diff --git a/examples/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/tutorials/gettingStartedQml/core/MenuBar.qml index 8d7be29..f131180 100644 --- a/examples/tutorials/gettingStartedQml/core/MenuBar.qml +++ b/examples/tutorials/gettingStartedQml/core/MenuBar.qml @@ -70,7 +70,6 @@ Rectangle { text: "menu: " color: "lightblue" font { weight: Font.Light; italic: true } - smooth: true } //row displays its children in a vertical row Row { @@ -85,7 +84,6 @@ Rectangle { scale: menuListView.currentIndex == 0? 1.25: 1 labelSize: menuListView.currentIndex == 0? 16:12 radius: 1 - smooth:true //on a button click, change the list's currently selected item to FileMenu onButtonClick: menuListView.currentIndex = 0 gradient: Gradient { @@ -101,7 +99,6 @@ Rectangle { label: "Edit" radius: 1 labelSize: menuListView.currentIndex == 1? 16:12 - smooth:true //on a button click, change the list's currently selected item to EditMenu onButtonClick: menuListView.currentIndex = 1 gradient: Gradient { diff --git a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml b/examples/tutorials/gettingStartedQml/parts/part1/Button.qml index 118e6fc..15ac50b 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml +++ b/examples/tutorials/gettingStartedQml/parts/part1/Button.qml @@ -60,7 +60,7 @@ Rectangle { //set appearance properties radius: 10 - smooth: true + antialiasing: true border{color: "white"; width: 3} width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml b/examples/tutorials/gettingStartedQml/parts/part2/Button.qml index aa178f8..51cfb7d 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml +++ b/examples/tutorials/gettingStartedQml/parts/part2/Button.qml @@ -60,7 +60,7 @@ Rectangle { //set appearance properties radius:10 - smooth: true + antialiasing: true border{color: "white"; width: 3} width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/tutorials/gettingStartedQml/parts/part3/Button.qml index aa178f8..51cfb7d 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml +++ b/examples/tutorials/gettingStartedQml/parts/part3/Button.qml @@ -60,7 +60,7 @@ Rectangle { //set appearance properties radius:10 - smooth: true + antialiasing: true border{color: "white"; width: 3} width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml b/examples/tutorials/gettingStartedQml/parts/part4/Button.qml index 7fb4f1e..830e3ef 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml +++ b/examples/tutorials/gettingStartedQml/parts/part4/Button.qml @@ -62,7 +62,7 @@ Rectangle { //set appearance properties radius:10 - smooth: true + antialiasing: true border.color: "white" border.width: 3 width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml index f6dd54a..9ed4ee9 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml +++ b/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml @@ -63,7 +63,7 @@ Rectangle { property real labelSize: 14 //set appearance properties radius:6 - smooth: true + antialiasing: true border.width: 2 border.color: borderColor width: buttonWidth; height: buttonHeight diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml index af83ef5..2d7e0fe 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml +++ b/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml @@ -55,6 +55,7 @@ Rectangle { Rectangle{ id: dirBox radius: 10 + antialiasing: true anchors.centerIn:parent height: parent.height -15; width: parent.width -30 @@ -63,6 +64,7 @@ Rectangle { height:parent.height*0.1 width: parent.width radius:3 + antialiasing: true z:1 gradient: Gradient { GradientStop { position: 0.0; color: "#8C8F8C" } @@ -117,7 +119,7 @@ Rectangle { width:parent.width; height:parent.height anchors.centerIn: parent radius: 10 - smooth: true + antialiasing: true scale: GridView.view.currentIndex == index ? 1 : 0.5 opacity: GridView.view.currentIndex == index ? 1 : 0 Text{ @@ -128,7 +130,6 @@ Rectangle { color: "#696167" font.weight: Font.DemiBold font.pointSize: 12 - smooth:true elide: Text.ElideMiddle horizontalAlignment: Text.AlignHCenter } diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml b/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml index 4a13f59..186eb20 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml +++ b/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml @@ -70,7 +70,6 @@ Rectangle { text: "menu: " color: "lightblue" font {weight: Font.Light; italic: true} - smooth: true } //row displays its children in a vertical row @@ -86,7 +85,6 @@ Rectangle { scale: menuListView.currentIndex == 0? 1.25: 1 labelSize: menuListView.currentIndex == 0? 16:12 radius: 1 - smooth:true //on a button click, change the list's currently selected item to FileMenu onButtonClick: menuListView.currentIndex = 0 gradient: Gradient{ @@ -102,7 +100,6 @@ Rectangle { label: "Edit" radius: 1 labelSize: menuListView.currentIndex == 1? 16:12 - smooth:true //on a button click, change the list's currently selected item to EditMenu onButtonClick: menuListView.currentIndex = 1 gradient: Gradient{ diff --git a/examples/tutorials/samegame/samegame1/Button.qml b/examples/tutorials/samegame/samegame1/Button.qml index 6d1d126..90eb9b7 100644 --- a/examples/tutorials/samegame/samegame1/Button.qml +++ b/examples/tutorials/samegame/samegame1/Button.qml @@ -50,7 +50,7 @@ Rectangle { width: buttonLabel.width + 20; height: buttonLabel.height + 5 border { width: 1; color: Qt.darker(activePalette.button) } - smooth: true + antialiasing: true radius: 8 // color the button with a gradient diff --git a/examples/tutorials/samegame/samegame2/Button.qml b/examples/tutorials/samegame/samegame2/Button.qml index 248c20c..df5f840 100644 --- a/examples/tutorials/samegame/samegame2/Button.qml +++ b/examples/tutorials/samegame/samegame2/Button.qml @@ -49,7 +49,7 @@ Rectangle { width: buttonLabel.width + 20; height: buttonLabel.height + 5 border { width: 1; color: Qt.darker(activePalette.button) } - smooth: true + antialiasing: true radius: 8 // color the button with a gradient diff --git a/examples/tutorials/samegame/samegame3/Button.qml b/examples/tutorials/samegame/samegame3/Button.qml index 248c20c..df5f840 100644 --- a/examples/tutorials/samegame/samegame3/Button.qml +++ b/examples/tutorials/samegame/samegame3/Button.qml @@ -49,7 +49,7 @@ Rectangle { width: buttonLabel.width + 20; height: buttonLabel.height + 5 border { width: 1; color: Qt.darker(activePalette.button) } - smooth: true + antialiasing: true radius: 8 // color the button with a gradient diff --git a/examples/tutorials/samegame/samegame4/content/Button.qml b/examples/tutorials/samegame/samegame4/content/Button.qml index 248c20c..df5f840 100644 --- a/examples/tutorials/samegame/samegame4/content/Button.qml +++ b/examples/tutorials/samegame/samegame4/content/Button.qml @@ -49,7 +49,7 @@ Rectangle { width: buttonLabel.width + 20; height: buttonLabel.height + 5 border { width: 1; color: Qt.darker(activePalette.button) } - smooth: true + antialiasing: true radius: 8 // color the button with a gradient diff --git a/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml b/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml index cf60741..36d8c95 100644 --- a/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml +++ b/src/qml/doc/snippets/qml/qml-documents/qmldocuments.qml @@ -47,7 +47,7 @@ Rectangle { width: 100; height: 30 border.width: 1 radius: 5 - smooth: true + antialiasing: true gradient: Gradient { GradientStop { position: 0.0; color: "darkGray" } diff --git a/src/qml/doc/snippets/qml/reusablecomponents/Button.qml b/src/qml/doc/snippets/qml/reusablecomponents/Button.qml index cedc782..0e41868 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/Button.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/Button.qml @@ -48,7 +48,7 @@ Rectangle { //! [properties] width: 145; height: 60 color: "blue" - smooth: true; radius: 9 + antialiasing: true; radius: 9 property alias text: label.text //! [properties] //! [object alias] diff --git a/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml b/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml index 34fc629..535641e 100644 --- a/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml +++ b/src/qml/doc/snippets/qml/reusablecomponents/focusbutton.qml @@ -59,7 +59,7 @@ FocusScope { //! [properties] width: 145; height: 60 color: "blue" - smooth: true; radius: 9 + antialiasing: true; radius: 9 property alias text: label.text //! [properties] border {color: "#B9C5D0"; width: 1} diff --git a/src/quick/doc/snippets/qml/focus/MyClickableWidget.qml b/src/quick/doc/snippets/qml/focus/MyClickableWidget.qml index 7017f1b..3c487ad 100644 --- a/src/quick/doc/snippets/qml/focus/MyClickableWidget.qml +++ b/src/quick/doc/snippets/qml/focus/MyClickableWidget.qml @@ -52,7 +52,7 @@ FocusScope { Rectangle { id: rectangle anchors.centerIn: parent - color: "lightsteelblue"; width: 175; height: 25; radius: 10; smooth: true + color: "lightsteelblue"; width: 175; height: 25; radius: 10; antialiasing: true Text { id: label; anchors.centerIn: parent } focus: true Keys.onPressed: { diff --git a/src/quick/doc/snippets/qml/focus/MyWidget.qml b/src/quick/doc/snippets/qml/focus/MyWidget.qml index 5899b18..591dbd6 100644 --- a/src/quick/doc/snippets/qml/focus/MyWidget.qml +++ b/src/quick/doc/snippets/qml/focus/MyWidget.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 //! [mywidget] Rectangle { id: widget - color: "lightsteelblue"; width: 175; height: 25; radius: 10; smooth: true + color: "lightsteelblue"; width: 175; height: 25; radius: 10; antialiasing: true Text { id: label; anchors.centerIn: parent} focus: true Keys.onPressed: { diff --git a/src/quick/doc/snippets/qml/focus/myfocusscopewidget.qml b/src/quick/doc/snippets/qml/focus/myfocusscopewidget.qml index f568c39..0eb992f 100644 --- a/src/quick/doc/snippets/qml/focus/myfocusscopewidget.qml +++ b/src/quick/doc/snippets/qml/focus/myfocusscopewidget.qml @@ -51,7 +51,7 @@ FocusScope { Rectangle { id: rectangle anchors.centerIn: parent - color: "lightsteelblue"; width: 175; height: 25; radius: 10; smooth: true + color: "lightsteelblue"; width: 175; height: 25; radius: 10; antialiasing: true Text { id: label; anchors.centerIn: parent } focus: true Keys.onPressed: { diff --git a/src/quick/doc/snippets/qml/propertyaction.qml b/src/quick/doc/snippets/qml/propertyaction.qml index 5ddef30..20208d9 100644 --- a/src/quick/doc/snippets/qml/propertyaction.qml +++ b/src/quick/doc/snippets/qml/propertyaction.qml @@ -74,9 +74,9 @@ Row { //![standalone] SequentialAnimation { - PropertyAction { target: img; property: "smooth"; value: "true" } + PropertyAction { target: img; property: "opacity"; value: .5 } NumberAnimation { target: img; property: "width"; to: 300; duration: 1000 } - PropertyAction { target: img; property: "smooth"; value: "false" } + PropertyAction { target: img; property: "opacity"; value: 1 } } //![standalone] } diff --git a/src/quick/doc/snippets/qml/rotation.qml b/src/quick/doc/snippets/qml/rotation.qml index c7f9df3..2886f68 100644 --- a/src/quick/doc/snippets/qml/rotation.qml +++ b/src/quick/doc/snippets/qml/rotation.qml @@ -48,22 +48,18 @@ Row { Image { source: "pics/qt.png" transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 18 } - smooth: true } Image { source: "pics/qt.png" transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 36 } - smooth: true } Image { source: "pics/qt.png" transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 54 } - smooth: true } Image { source: "pics/qt.png" transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 72 } - smooth: true } } //! [0] diff --git a/src/quick/doc/snippets/qml/rotationanimation.qml b/src/quick/doc/snippets/qml/rotationanimation.qml index caa1ce8..7fc081e 100644 --- a/src/quick/doc/snippets/qml/rotationanimation.qml +++ b/src/quick/doc/snippets/qml/rotationanimation.qml @@ -48,7 +48,7 @@ Item { id: rect width: 150; height: 100; anchors.centerIn: parent color: "red" - smooth: true + antialiasing: true states: State { name: "rotated" diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index bb15f36..8258dba 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -140,11 +140,7 @@ QT_BEGIN_NAMESPACE The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage can be used to simulate a shadow effect on a rectangular item. - \section1 Quality and Performance - - By default, any scaled regions of the image are rendered without smoothing to improve - rendering speed. Setting the \l smooth property improves rendering quality of scaled - regions, but may slow down rendering. + \section1 Image Loading The source image may not be loaded instantaneously, depending on its original location. Loading progress can be monitored with the \l progress property. @@ -205,16 +201,12 @@ QQuickBorderImage::~QQuickBorderImage() /*! \qmlproperty bool QtQuick2::BorderImage::smooth - Set this property if you want the image to be smoothly filtered when scaled or - transformed. Smooth filtering gives better visual quality, but is slower. If - the image is displayed at its natural size, this property has no visual or - performance effect. - - By default, this property is set to false. + This property holds whether the image is smoothly filtered when scaled or + transformed. Smooth filtering gives better visual quality, but it may be slower + on some hardware. If the image is displayed at its natural size, this property + has no visual or performance effect. - \note Generally scaling artifacts are only visible if the image is stationary on - the screen. A common pattern when animating an image is to disable smooth - filtering at the beginning of the animation and enable it at the conclusion. + By default, this property is set to true. */ /*! diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 8b0392f..44aa973 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -199,7 +199,6 @@ void QQuickImagePrivate::setImage(const QImage &image) \qml Image { width: 130; height: 100 - smooth: true source: "qtlogo.png" } \endqml @@ -211,7 +210,6 @@ void QQuickImagePrivate::setImage(const QImage &image) Image { width: 130; height: 100 fillMode: Image.PreserveAspectFit - smooth: true source: "qtlogo.png" } \endqml @@ -223,7 +221,6 @@ void QQuickImagePrivate::setImage(const QImage &image) Image { width: 130; height: 100 fillMode: Image.PreserveAspectCrop - smooth: true source: "qtlogo.png" clip: true } @@ -247,7 +244,6 @@ void QQuickImagePrivate::setImage(const QImage &image) Image { width: 120; height: 120 fillMode: Image.TileVertically - smooth: true source: "qtlogo.png" } \endqml @@ -259,7 +255,6 @@ void QQuickImagePrivate::setImage(const QImage &image) Image { width: 120; height: 120 fillMode: Image.TileHorizontally - smooth: true source: "qtlogo.png" } \endqml @@ -360,14 +355,12 @@ qreal QQuickImage::paintedHeight() const /*! \qmlproperty bool QtQuick2::Image::smooth - Set this property if you want the image to be smoothly filtered when scaled or - transformed. Smooth filtering gives better visual quality, but is slower. If - the image is displayed at its natural size, this property has no visual or - performance effect. + This property holds whether the image is smoothly filtered when scaled or + transformed. Smooth filtering gives better visual quality, but it may be slower + on some hardware. If the image is displayed at its natural size, this property has + no visual or performance effect. - \note Generally scaling artifacts are only visible if the image is stationary on - the screen. A common pattern when animating an image is to disable smooth - filtering at the beginning of the animation and reenable it at the conclusion. + By default, this property is set to true. */ /*! diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp index c2c7643..113332f 100644 --- a/src/quick/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -185,7 +185,6 @@ QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, const QVector property variant source: Image { source: "qt-logo.png" sourceSize { width: 200; height: 200 } - smooth: true } vertexShader: " uniform highp mat4 qt_Matrix; diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index d2a1ad2..65a6cdc 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -531,8 +531,9 @@ QImage QQuickShaderEffectTexture::toImage() const which is the case for most embedded graphics chips, edges rendered inside a ShaderEffectSource will not be antialiased. One way to remedy this is to double the size of the effect source and render it with - \c {smooth: true}. This will be equivalent to 4x multisampling, at - the cost of lower performance and higher memory use. + \c {smooth: true} (this is the default value of smooth). + This will be equivalent to 4x multisampling, at the cost of lower performance + and higher memory use. \warning In most cases, using a ShaderEffectSource will decrease performance, and in all cases, it will increase video memory usage. diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 34a70ca..bb7b451 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1000,8 +1000,8 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action It is useful for setting non-animated property values during an animation. For example, here is a SequentialAnimation that sets the image's - \l {Image::}{smooth} property to \c true, animates the width of the image, - then sets \l {Image::}{smooth} back to \c false: + \l {Item::}{opacity} property to \c .5, animates the width of the image, + then sets \l {Item::}{opacity} back to \c 1: \snippet qml/propertyaction.qml standalone