aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/canvas/bezierCurve/bezierCurve.qml2
-rw-r--r--examples/declarative/canvas/clip/clip.qml2
-rw-r--r--examples/declarative/canvas/pixels/pixels.qml14
-rw-r--r--examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml2
-rw-r--r--examples/declarative/canvas/roundedrect/roundedrect.qml2
-rw-r--r--examples/declarative/canvas/smile/smile.qml2
-rw-r--r--examples/declarative/canvas/squircle/squircle.qml2
-rw-r--r--examples/declarative/canvas/stockchart/stock.qml2
-rw-r--r--examples/declarative/canvas/tiger/tiger.qml2
-rw-r--r--examples/declarative/canvas/twitterfriends/twitter.qml2
10 files changed, 16 insertions, 16 deletions
diff --git a/examples/declarative/canvas/bezierCurve/bezierCurve.qml b/examples/declarative/canvas/bezierCurve/bezierCurve.qml
index 1e29911076..4dc9dd1cf5 100644
--- a/examples/declarative/canvas/bezierCurve/bezierCurve.qml
+++ b/examples/declarative/canvas/bezierCurve/bezierCurve.qml
@@ -65,7 +65,7 @@ Item {
property real rotate : rotateCtrl.value
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
Behavior on scaleX { SpringAnimation { spring: 2; damping: 0.2; loops:Animation.Infinite } }
diff --git a/examples/declarative/canvas/clip/clip.qml b/examples/declarative/canvas/clip/clip.qml
index c7c5ed0f5f..bf0d8fb75b 100644
--- a/examples/declarative/canvas/clip/clip.qml
+++ b/examples/declarative/canvas/clip/clip.qml
@@ -66,7 +66,7 @@ Item {
property string imagefile:"../contents/qt-logo.png"
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
Component.onCompleted:loadImage(canvas.imagefile);
onAlphaChanged:requestPaint();
diff --git a/examples/declarative/canvas/pixels/pixels.qml b/examples/declarative/canvas/pixels/pixels.qml
index 6bd0525f6a..bb67eae965 100644
--- a/examples/declarative/canvas/pixels/pixels.qml
+++ b/examples/declarative/canvas/pixels/pixels.qml
@@ -56,7 +56,7 @@ Item {
height:360
smooth:true
renderTarget:Canvas.FramebufferObject
- renderInThread:false
+ renderStrategy: Canvas.Cooperative
property string image :"../contents/qt-logo.png"
Component.onCompleted:loadImage(image);
onImageLoaded:requestPaint();
@@ -66,12 +66,12 @@ Item {
if (canvas.isImageLoaded(image)) {
var pixels = ctx.createImageData(image);
//pixels.mirror();
- pixels.filter(Canvas.GrayScale);
- //pixels.filter(Canvas.Threshold, 100); //default 127
- //pixels.filter(Canvas.Blur, 20); //default 10
- //pixels.filter(Canvas.Opaque);
- //pixels.filter(Canvas.Invert);
- //pixels.filter(Canvas.Convolute, [0,-1,0,
+ pixels.filter(ctx.GrayScale);
+ //pixels.filter(ctx.Threshold, 100); //default 127
+ //pixels.filter(ctx.Blur, 20); //default 10
+ //pixels.filter(ctx.Opaque);
+ //pixels.filter(ctx.Invert);
+ //pixels.filter(ctx.Convolute, [0,-1,0,
// -1,5,-1,
// 0,-1,0]);
//ctx.putImageData(pixels, 0, 0, canvas.width, canvas.height);
diff --git a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml b/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml
index 3f565a8493..047fcfd949 100644
--- a/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml
+++ b/examples/declarative/canvas/quadraticCurveTo/quadraticCurveTo.qml
@@ -65,7 +65,7 @@ Item {
property real rotate : rotateCtrl.value
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
onLineWidthChanged:requestPaint();
onFillChanged:requestPaint();
diff --git a/examples/declarative/canvas/roundedrect/roundedrect.qml b/examples/declarative/canvas/roundedrect/roundedrect.qml
index fceed9c38a..9fb9181fd1 100644
--- a/examples/declarative/canvas/roundedrect/roundedrect.qml
+++ b/examples/declarative/canvas/roundedrect/roundedrect.qml
@@ -55,7 +55,7 @@ Item {
height:360
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
property int radius: rCtrl.value
property int rectx: rxCtrl.value
diff --git a/examples/declarative/canvas/smile/smile.qml b/examples/declarative/canvas/smile/smile.qml
index 5963cde9af..44909564c9 100644
--- a/examples/declarative/canvas/smile/smile.qml
+++ b/examples/declarative/canvas/smile/smile.qml
@@ -56,7 +56,7 @@ Item {
height:360
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
property string strokeStyle:"green"
property string fillStyle:"yellow"
diff --git a/examples/declarative/canvas/squircle/squircle.qml b/examples/declarative/canvas/squircle/squircle.qml
index 801249b4d6..9c0860c9f5 100644
--- a/examples/declarative/canvas/squircle/squircle.qml
+++ b/examples/declarative/canvas/squircle/squircle.qml
@@ -61,7 +61,7 @@ Item {
height:360
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
property string strokeStyle:"blue"
property string fillStyle:"steelblue"
diff --git a/examples/declarative/canvas/stockchart/stock.qml b/examples/declarative/canvas/stockchart/stock.qml
index 0dfad6cf70..d02f07bc38 100644
--- a/examples/declarative/canvas/stockchart/stock.qml
+++ b/examples/declarative/canvas/stockchart/stock.qml
@@ -337,8 +337,8 @@ Rectangle {
anchors.bottom : view.top
width:container.width;
opacity:0
- renderInThread:false
renderTarget: Canvas.Image
+ renderStrategy: Canvas.Immediate
property bool running:false
property int frames:first
property int mouseX:0;
diff --git a/examples/declarative/canvas/tiger/tiger.qml b/examples/declarative/canvas/tiger/tiger.qml
index 4b1d9ff031..0e3770e6e3 100644
--- a/examples/declarative/canvas/tiger/tiger.qml
+++ b/examples/declarative/canvas/tiger/tiger.qml
@@ -57,7 +57,7 @@ Item {
height:360
smooth:true
renderTarget:Canvas.FramebufferObject
- renderInThread:false
+ renderStrategy: Canvas.Cooperative
property string strokeStyle:"steelblue"
property string fillStyle:"yellow"
property bool fill:true
diff --git a/examples/declarative/canvas/twitterfriends/twitter.qml b/examples/declarative/canvas/twitterfriends/twitter.qml
index d25773127d..81b29d2fda 100644
--- a/examples/declarative/canvas/twitterfriends/twitter.qml
+++ b/examples/declarative/canvas/twitterfriends/twitter.qml
@@ -98,7 +98,7 @@ Rectangle {
anchors.bottom : parent.bottom
smooth:true
renderTarget:Canvas.Image
- renderInThread:false
+ renderStrategy: Canvas.Immediate
property bool layoutChanged:true
property string twitterName:""