From 583f0c9238a4e92ed665d3dabde6048205569574 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 20 Jan 2017 15:52:25 +0100 Subject: Doc: Fix the snippet walk-through sequence Apparently the StockChart.qml has changed so some of the references were invalid, resulting in a qdoc warning. Change-Id: I43d6d37dc6ec14c3c80e1adb7ac930b65845d6b5 Reviewed-by: Nico Vertriest --- examples/quick/demos/stocqt/doc/src/stocqt.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc index bd204c8211..800bba570c 100644 --- a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc +++ b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc @@ -69,7 +69,7 @@ \quotefromfile demos/stocqt/content/StockChart.qml \skipto Rectangle - \printuntil height + \printuntil id \dots \skipto Canvas \printuntil id -- cgit v1.2.3 From 68932f24c66e2589bc202f4b5b7c248b7d19e6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 26 Jan 2017 16:18:00 +0100 Subject: Add 10mm rectangle to screen example to verify Screen.pixelDensity Change-Id: Icaca370be3eae3ed50971e5bd2f6f5f7278c2962 Reviewed-by: Friedemann Kleint --- examples/quick/window/CurrentScreen.qml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'examples') diff --git a/examples/quick/window/CurrentScreen.qml b/examples/quick/window/CurrentScreen.qml index c65baab1f4..09fbce9a74 100644 --- a/examples/quick/window/CurrentScreen.qml +++ b/examples/quick/window/CurrentScreen.qml @@ -101,5 +101,12 @@ Item { Shared.Label { text: "primary orientation" } Shared.Label { text: orientationToString(Screen.primaryOrientation) + " (" + Screen.primaryOrientation + ")" } //! [screen] + + Shared.Label { text: "10mm rectangle" } + Rectangle { + color: "red" + width: Screen.pixelDensity * 10 + height: width + } } } -- cgit v1.2.3 From 3e537dd3dcf5608241282d8437fb1593d2e6fa17 Mon Sep 17 00:00:00 2001 From: Ionut Alexandrescu Date: Fri, 3 Feb 2017 17:47:11 +0100 Subject: Fix smile qml example The mouth line was not closed and the right eye line was too big Change-Id: Ifea4a8dbdd38df3c83cd80491210585fcbb76d3c Reviewed-by: Simon Hausmann --- examples/quick/canvas/smile/smile.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/quick/canvas/smile/smile.qml b/examples/quick/canvas/smile/smile.qml index eebfee2d77..25e9d031de 100644 --- a/examples/quick/canvas/smile/smile.qml +++ b/examples/quick/canvas/smile/smile.qml @@ -101,14 +101,14 @@ Item { ctx.moveTo(75 + 50 * Math.cos(0), 75 - 50 * Math.sin(Math.PI*2)); ctx.arc(75,75,50,0,Math.PI*2,true); // Outer circle - ctx.moveTo(75,70); - ctx.arc(75,70,35,0,Math.PI,false); // Mouth (clockwise) - ctx.moveTo(60,65); - ctx.arc(60,65,5,0,Math.PI*2,true); // Left eye + ctx.moveTo(60,60); + ctx.arc(60,60,5,0,Math.PI*2,true); // Left eye ctx.moveTo(90 + 5 * Math.cos(0), 65 - 5 * Math.sin(Math.PI*2)); - ctx.moveTo(90,65); - ctx.arc(90,65,5,0,Math.PI*2,true); // Right eye + ctx.moveTo(90,60); + ctx.arc(90,60,5,-Math.PI,Math.PI*3,false); // Right eye + ctx.moveTo(75,70); + ctx.arc(75,70,35,0,Math.PI,false); // Mouth (clockwise) ctx.closePath(); if (canvas.fill) ctx.fill(); -- cgit v1.2.3