Commit ddff2017 authored by Gunnar Sletta's avatar Gunnar Sletta Committed by Qt by Nokia

Change smooth to be true by default

Change-Id: Ia74a5c76058a2822e61dfa2f7316ea0612ebc15c
Reviewed-by: 's avatarLars Knoll <lars.knoll@nokia.com>
parent 9d1b013d
......@@ -2387,7 +2387,7 @@ bool QQuickItem::isComponentComplete() const
QQuickItemPrivate::QQuickItemPrivate()
: _anchors(0), _stateGroup(0),
flags(0), widthValid(false), heightValid(false), baselineOffsetValid(false), componentComplete(true),
keepMouse(false), keepTouch(false), hoverEnabled(false), smooth(false), focus(false), activeFocus(false), notifiedFocus(false),
keepMouse(false), keepTouch(false), hoverEnabled(false), smooth(true), focus(false), activeFocus(false), notifiedFocus(false),
notifiedActiveFocus(false), filtersChildMouseEvents(false), explicitVisible(true),
effectiveVisible(true), explicitEnable(true), effectiveEnable(true), polishScheduled(false),
inheritedLayoutMirror(false), effectiveLayoutMirror(false), isMirrorImplicit(true),
......@@ -4314,13 +4314,15 @@ void QQuickItemPrivate::itemChange(QQuickItem::ItemChange change, const QQuickIt
/*!
\property QQuickItem::smooth
\brief whether the item is smoothly transformed.
\brief whether the item is smoothed or not.
This property is provided purely for the purpose of optimization. Turning
smooth transforms off is faster, but looks worse; turning smooth
transformations on is slower, but looks better.
Primarily used in image based elements to decide if the item should use smooth
sampling or not. Smooth sampling is performed using linear interpolation, while
non-smooth is performed using nearest neighbor.
By default smooth transformations are off.
In Qt Quick 2.0, this property has minimal impact on performance.
By default is true.
*/
/*!
......
......@@ -4,6 +4,7 @@ import "testhelper.js" as Helper
Canvas {
id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded
smooth: false
TestCase {
name: "arc"; when: windowShown
function test_angle_1() {
......
......@@ -4,6 +4,7 @@ import "testhelper.js" as Helper
Canvas {
id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded
smooth: false
TestCase {
name: "arcTo"; when: windowShown
function test_coincide() {
......
......@@ -4,6 +4,7 @@ import "testhelper.js" as Helper
Canvas {
id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded
smooth: false
TestCase {
name: "path"; when: windowShown
......
......@@ -4,6 +4,7 @@ import "testhelper.js" as Helper
Canvas {
id:canvas; width:100;height:50; renderTarget:Canvas.Image; renderStrategy:Canvas.Threaded
smooth: false
TestCase {
name: "strokeStyle"; when: windowShown
function test_default() {
......
......@@ -1071,11 +1071,11 @@ void tst_qquicktext::smooth()
for (int i = 0; i < standard.size(); i++)
{
{
QString componentStr = "import QtQuick 2.0\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + standard.at(i) + "\" }";
QQmlComponent textComponent(&engine);
textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
QCOMPARE(textObject->smooth(), true);
QCOMPARE(textObject->smooth(), false);
delete textObject;
}
......@@ -1084,7 +1084,7 @@ void tst_qquicktext::smooth()
QQmlComponent textComponent(&engine);
textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
QCOMPARE(textObject->smooth(), false);
QCOMPARE(textObject->smooth(), true);
delete textObject;
}
......@@ -1092,11 +1092,11 @@ void tst_qquicktext::smooth()
for (int i = 0; i < richText.size(); i++)
{
{
QString componentStr = "import QtQuick 2.0\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
QString componentStr = "import QtQuick 2.0\nText { smooth: false; text: \"" + richText.at(i) + "\" }";
QQmlComponent textComponent(&engine);
textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
QCOMPARE(textObject->smooth(), true);
QCOMPARE(textObject->smooth(), false);
delete textObject;
}
......@@ -1105,7 +1105,7 @@ void tst_qquicktext::smooth()
QQmlComponent textComponent(&engine);
textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
QCOMPARE(textObject->smooth(), false);
QCOMPARE(textObject->smooth(), true);
delete textObject;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment