diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-02-26 13:35:46 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-26 15:13:54 +0100 |
commit | 98e00abc19ad46072f7c8303e50f9748d36a925e (patch) | |
tree | 7ff3c192f838febcc211c7b80b1dd926edf9dd9e | |
parent | f289fdc53e85bf0f2002070fa883f5c01bae1232 (diff) |
Change Canvas to use Image and antialiasing by default.
Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 3 | ||||
-rw-r--r-- | tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 7c91193623..ea49d58af3 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -190,9 +190,10 @@ QQuickCanvasItemPrivate::QQuickCanvasItemPrivate() , hasCanvasWindow(false) , available(false) , contextInitialized(false) - , renderTarget(QQuickCanvasItem::FramebufferObject) + , renderTarget(QQuickCanvasItem::Image) , renderStrategy(QQuickCanvasItem::Cooperative) { + antialiasing = true; } QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate() diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml index b9e8d75f5a..000888a36f 100644 --- a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml +++ b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml @@ -5,6 +5,7 @@ Component { id:canvas Canvas { id:c + antialiasing: false; width:100;height:100 onPaint :{} //this line is needed for some tests (make sure onPaint handler always called property alias paintCount:spyPaint.count @@ -27,4 +28,4 @@ Component { SignalSpy {id: spyImageLoaded;target:c;signalName: "imageLoaded"} SignalSpy {id: spyAvailableChanged;target:c;signalName: "availableChanged"} } -}
\ No newline at end of file +} |