diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2021-04-30 10:13:56 +0200 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2021-05-03 10:17:18 +0200 |
| commit | 63b418eb549e45782b3dbcaeb963a042e3db8f93 (patch) | |
| tree | be69c1281f1bcc52bc81adef246fa25c12c3019a /examples/quick | |
| parent | 1922fcbb7603549adbd1954c0eb250ce0867c60b (diff) | |
examples: Use template literals for multiline strings
Change-Id: I660a74730edf60d0b7760162b441e3e14749e930
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/embeddedinwidgets/main.qml | 4 | ||||
| -rw-r--r-- | examples/quick/shapes/content/tiger.qml | 4 | ||||
| -rw-r--r-- | examples/quick/views/listview/content/RecipesModel.qml | 32 |
3 files changed, 20 insertions, 20 deletions
diff --git a/examples/quick/embeddedinwidgets/main.qml b/examples/quick/embeddedinwidgets/main.qml index e46f027bdb..e644a76587 100644 --- a/examples/quick/embeddedinwidgets/main.qml +++ b/examples/quick/embeddedinwidgets/main.qml @@ -103,7 +103,7 @@ Rectangle { property variant source: column; property size sourceSize: Qt.size(0.5 / column.width, 0.5 / column.height); - fragmentShader: " + fragmentShader: ` varying highp vec2 qt_TexCoord0; uniform lowp sampler2D source; uniform lowp vec2 sourceSize; @@ -117,6 +117,6 @@ Rectangle { + texture2D(source, tc + sourceSize * vec2(-1, 1)) ); gl_FragColor = col * qt_Opacity * (1.0 - qt_TexCoord0.y) * 0.2; - }" + }` } } diff --git a/examples/quick/shapes/content/tiger.qml b/examples/quick/shapes/content/tiger.qml index 317ec88b31..371db791b0 100644 --- a/examples/quick/shapes/content/tiger.qml +++ b/examples/quick/shapes/content/tiger.qml @@ -3627,7 +3627,7 @@ Shape { strokeColor: "red" strokeWidth: 4 fillColor: "transparent" - PathSvg { path: "m 325.03711,0.5 + PathSvg { path: `m 325.03711,0.5 c -26.61408,6.4494547 -49.95197,2.1018066 -76.21132,1.0771669 -22.26577,7.6817151 -47.96405,9.3627181 -65.67832,25.8497861 -15.74718,12.80008 -41.1564,19.605644 -45.74903,40.600391 @@ -3706,7 +3706,7 @@ Shape { 450.82861,4.7342783 435.04883,22.626367 409.5188,28.206712 386.3569,24.131269 365.63904,8.0954152 352.788,2.8857182 338.88892,0.40735091 325.03711,0.5 Z m -219.0625,357.04297 - -0.97656,0.88476 z" + -0.97656,0.88476 z` } } } diff --git a/examples/quick/views/listview/content/RecipesModel.qml b/examples/quick/views/listview/content/RecipesModel.qml index 05f6d8a472..1f26941b0a 100644 --- a/examples/quick/views/listview/content/RecipesModel.qml +++ b/examples/quick/views/listview/content/RecipesModel.qml @@ -54,22 +54,22 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> + ingredients: `<html> <ul> <li> 1 cup (150g) self-raising flour <li> 1 tbs caster sugar <li> 3/4 cup (185ml) milk <li> 1 egg </ul> - </html>" - method: "<html> + </html>` + method: `<html> <ol> <li> Sift flour and sugar together into a bowl. Add a pinch of salt. <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. <li> Turn over and cook other side until golden. </ol> - </html>" + </html>` } ListElement { title: "Fruit Salad" @@ -80,7 +80,7 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> + ingredients: `<html> <ul> <li> 1 onion <li> 1 turnip @@ -89,51 +89,51 @@ ListModel { <li> 1 head of celery <li> 1 1/2 litres of water </ul> - </html>" - method: "<html> + </html>` + method: `<html> <ol> <li> Chop vegetables. <li> Boil in water until vegetables soften. <li> Season with salt and pepper to taste. </ol> - </html>" + </html>` } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> + ingredients: `<html> <ul> <li> 500g minced beef <li> Seasoning <li> lettuce, tomato, onion, cheese <li> 1 hamburger bun for each burger </ul> - </html>" - method: "<html> + </html>` + method: `<html> <ol> <li> Mix the beef, together with seasoning, in a food processor. <li> Shape the beef into burgers. <li> Grill the burgers for about 5 mins on each side (until cooked through) <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. </ol> - </html>" + </html>` } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> + ingredients: `<html> <ul> <li> 1 cup Lemon Juice <li> 1 cup Sugar <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) </ul> - </html>" - method: "<html> + </html>` + method: `<html> <ol> <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. <li> Pour in lemon juice, stir again, and add 4 cups of cold water. <li> Chill or serve over ice cubes. </ol> - </html>" + </html>` } } |