diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-05-31 12:42:09 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-02 10:16:52 +0000 |
commit | 961da5273e17655e73ec0975c6de446b88d7f5ca (patch) | |
tree | 6ef897a1149fc69d0905d7233106232208e07b2d /examples/quick | |
parent | dece229a7c2284598c36fb668de766309a6893cf (diff) |
Rename to Shape/ShapePath and remove public JS API
Change-Id: I299354da0632fb0b8487cfb13748ed58b97d75fd
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'examples/quick')
-rw-r--r-- | examples/quick/quick.pro | 2 | ||||
-rw-r--r-- | examples/quick/shapes/content/item1.qml (renamed from examples/quick/pathitem/content/item1.qml) | 6 | ||||
-rw-r--r-- | examples/quick/shapes/content/item10.qml (renamed from examples/quick/pathitem/content/item10.qml) | 26 | ||||
-rw-r--r-- | examples/quick/shapes/content/item11.qml (renamed from examples/quick/pathitem/content/item11.qml) | 22 | ||||
-rw-r--r-- | examples/quick/shapes/content/item12.qml (renamed from examples/quick/pathitem/content/item12.qml) | 18 | ||||
-rw-r--r-- | examples/quick/shapes/content/item13.qml (renamed from examples/quick/pathitem/content/item13.qml) | 8 | ||||
-rw-r--r-- | examples/quick/shapes/content/item14.qml (renamed from examples/quick/pathitem/content/item14.qml) | 8 | ||||
-rw-r--r-- | examples/quick/shapes/content/item15.qml (renamed from examples/quick/pathitem/content/item15.qml) | 12 | ||||
-rw-r--r-- | examples/quick/shapes/content/item17.qml (renamed from examples/quick/pathitem/content/item17.qml) | 6 | ||||
-rw-r--r-- | examples/quick/shapes/content/item2.qml (renamed from examples/quick/pathitem/content/item2.qml) | 10 | ||||
-rw-r--r-- | examples/quick/shapes/content/item4.qml (renamed from examples/quick/pathitem/content/item4.qml) | 22 | ||||
-rw-r--r-- | examples/quick/shapes/content/item5.qml (renamed from examples/quick/pathitem/content/item5.qml) | 20 | ||||
-rw-r--r-- | examples/quick/shapes/content/item6.qml (renamed from examples/quick/pathitem/content/item6.qml) | 10 | ||||
-rw-r--r-- | examples/quick/shapes/content/item7.qml (renamed from examples/quick/pathitem/content/item7.qml) | 10 | ||||
-rw-r--r-- | examples/quick/shapes/content/item8.qml (renamed from examples/quick/pathitem/content/item8.qml) | 8 | ||||
-rw-r--r-- | examples/quick/shapes/content/item9.qml (renamed from examples/quick/pathitem/content/item9.qml) | 12 | ||||
-rw-r--r-- | examples/quick/shapes/content/pathitem.qml (renamed from examples/quick/pathitem/content/pathitem.qml) | 4 | ||||
-rw-r--r-- | examples/quick/shapes/content/pathitemgallery.qml (renamed from examples/quick/pathitem/content/pathitemgallery.qml) | 38 | ||||
-rw-r--r-- | examples/quick/shapes/content/pathiteminteract.qml (renamed from examples/quick/pathitem/content/pathiteminteract.qml) | 20 | ||||
-rw-r--r-- | examples/quick/shapes/content/pathitemsampling.qml (renamed from examples/quick/pathitem/content/pathitemsampling.qml) | 22 | ||||
-rw-r--r-- | examples/quick/shapes/content/pathitemtigers.qml (renamed from examples/quick/pathitem/content/pathitemtigers.qml) | 6 | ||||
-rw-r--r-- | examples/quick/shapes/content/tiger.qml (renamed from examples/quick/pathitem/content/tiger.qml) | 486 | ||||
-rw-r--r-- | examples/quick/shapes/main.cpp (renamed from examples/quick/pathitem/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/shapes/shapes.pro (renamed from examples/quick/pathitem/pathitem.pro) | 4 | ||||
-rw-r--r-- | examples/quick/shapes/shapes.qrc (renamed from examples/quick/pathitem/pathitem.qrc) | 0 |
25 files changed, 390 insertions, 390 deletions
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index bb5af35dc6..22dfff703e 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -24,7 +24,7 @@ SUBDIRS = quick-accessibility \ imageresponseprovider \ window \ particles \ - pathitem \ + shapes \ demos #OpenGL Support Required diff --git a/examples/quick/pathitem/content/item1.qml b/examples/quick/shapes/content/item1.qml index e870c50a89..8319c44ba4 100644 --- a/examples/quick/pathitem/content/item1.qml +++ b/examples/quick/shapes/content/item1.qml @@ -49,16 +49,16 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { id: ctr anchors.fill: parent - VisualPath { + ShapePath { strokeColor: "red" fillColor: "blue" diff --git a/examples/quick/pathitem/content/item10.qml b/examples/quick/shapes/content/item10.qml index 599d41506f..e7c183ab1f 100644 --- a/examples/quick/pathitem/content/item10.qml +++ b/examples/quick/shapes/content/item10.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" @@ -59,11 +59,11 @@ Rectangle { height: 200 anchors.centerIn: parent - PathItem { - id: pathItem + Shape { + id: shape anchors.fill: parent - VisualPath { + ShapePath { strokeWidth: 4 strokeColor: "black" fillColor: "lightBlue" @@ -90,13 +90,13 @@ Rectangle { target: cp1 property: "x" from: 0 - to: pathItem.width - cp1.width + to: shape.width - cp1.width duration: 5000 } NumberAnimation { target: cp1 property: "x" - from: pathItem.width - cp1.width + from: shape.width - cp1.width to: 0 duration: 5000 } @@ -104,13 +104,13 @@ Rectangle { target: cp1 property: "y" from: 0 - to: pathItem.height - cp1.height + to: shape.height - cp1.height duration: 5000 } NumberAnimation { target: cp1 property: "y" - from: pathItem.height - cp1.height + from: shape.height - cp1.height to: 0 duration: 5000 } @@ -121,7 +121,7 @@ Rectangle { id: cp2 color: "blue" width: 10; height: 10 - x: pathItem.width - width + x: shape.width - width SequentialAnimation { loops: Animation.Infinite running: true @@ -129,20 +129,20 @@ Rectangle { target: cp2 property: "y" from: 0 - to: pathItem.height - cp2.height + to: shape.height - cp2.height duration: 5000 } NumberAnimation { target: cp2 property: "y" - from: pathItem.height - cp2.height + from: shape.height - cp2.height to: 0 duration: 5000 } NumberAnimation { target: cp2 property: "x" - from: pathItem.width - cp2.width + from: shape.width - cp2.width to: 0 duration: 5000 } @@ -150,7 +150,7 @@ Rectangle { target: cp2 property: "x" from: 0 - to: pathItem.width - cp2.width + to: shape.width - cp2.width duration: 5000 } } diff --git a/examples/quick/pathitem/content/item11.qml b/examples/quick/shapes/content/item11.qml index 4f26663e5f..2632e116c4 100644 --- a/examples/quick/pathitem/content/item11.qml +++ b/examples/quick/shapes/content/item11.qml @@ -49,21 +49,21 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { - id: pathItem + Shape { + id: shape width: 220 height: 200 anchors.centerIn: parent - VisualPath { - fillGradient: PathLinearGradient { - y2: pathItem.height - PathGradientStop { position: 0; color: "yellow" } - PathGradientStop { position: 1; color: "green" } + ShapePath { + fillGradient: ShapeLinearGradient { + y2: shape.height + ShapeGradientStop { position: 0; color: "yellow" } + ShapeGradientStop { position: 1; color: "green" } } Path { @@ -88,7 +88,7 @@ Rectangle { } } - PathItem { + Shape { width: 120 height: 130 anchors.bottom: parent.bottom @@ -96,11 +96,11 @@ Rectangle { scale: 0.5 - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "darkBlue" strokeWidth: 20 - capStyle: VisualPath.RoundCap + capStyle: ShapePath.RoundCap Path { startX: 20; startY: 50 diff --git a/examples/quick/pathitem/content/item12.qml b/examples/quick/shapes/content/item12.qml index cf7e13dcca..c7220aea8c 100644 --- a/examples/quick/pathitem/content/item12.qml +++ b/examples/quick/shapes/content/item12.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" @@ -59,17 +59,17 @@ Rectangle { height: 200 anchors.centerIn: parent - PathItem { + Shape { anchors.fill: parent - VisualPath { + ShapePath { strokeColor: "transparent" - fillGradient: PathLinearGradient { + fillGradient: ShapeLinearGradient { id: grad y1: 50; y2: 150 - PathGradientStop { position: 0; color: "black" } - PathGradientStop { position: 1; color: "red" } + ShapeGradientStop { position: 0; color: "black" } + ShapeGradientStop { position: 1; color: "red" } } Path { @@ -87,16 +87,16 @@ Rectangle { interval: 3000 running: true repeat: true - property variant spreads: [ PathGradient.PadSpread, PathGradient.RepeatSpread, PathGradient.ReflectSpread ] + property variant spreads: [ ShapeGradient.PadSpread, ShapeGradient.RepeatSpread, ShapeGradient.ReflectSpread ] property variant spreadTexts: [ "PadSpread", "RepeatSpread", "ReflectSpread" ] property int spreadIdx: 0 onTriggered: { spreadIdx = (spreadIdx + 1) % spreads.length; grad.spread = spreads[spreadIdx] } } - PathItem { + Shape { anchors.fill: parent - VisualPath { + ShapePath { strokeColor: "gray" strokeWidth: 2 fillColor: "transparent" diff --git a/examples/quick/pathitem/content/item13.qml b/examples/quick/shapes/content/item13.qml index 02dc6a719e..8a69454b7c 100644 --- a/examples/quick/pathitem/content/item13.qml +++ b/examples/quick/shapes/content/item13.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" @@ -62,13 +62,13 @@ Rectangle { Repeater { model: 2 - PathItem { + Shape { anchors.fill: parent - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: model.index === 0 ? "red" : "blue" - strokeStyle: VisualPath.DashLine + strokeStyle: ShapePath.DashLine strokeWidth: 4 Path { diff --git a/examples/quick/pathitem/content/item14.qml b/examples/quick/shapes/content/item14.qml index 320ba7cb47..18be4ba671 100644 --- a/examples/quick/pathitem/content/item14.qml +++ b/examples/quick/shapes/content/item14.qml @@ -49,22 +49,22 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" Repeater { model: 2 - PathItem { + Shape { width: 200 height: 200 anchors.centerIn: parent - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: model.index === 0 ? "red" : "blue" - strokeStyle: VisualPath.DashLine + strokeStyle: ShapePath.DashLine strokeWidth: 4 Path { diff --git a/examples/quick/pathitem/content/item15.qml b/examples/quick/shapes/content/item15.qml index 470e2f88f3..c881f3513f 100644 --- a/examples/quick/pathitem/content/item15.qml +++ b/examples/quick/shapes/content/item15.qml @@ -49,22 +49,22 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" Repeater { model: 2 - PathItem { + Shape { width: 200 height: 200 anchors.centerIn: parent - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: model.index === 0 ? "red" : "blue" - strokeStyle: VisualPath.DashLine + strokeStyle: ShapePath.DashLine strokeWidth: 4 Path { @@ -81,12 +81,12 @@ Rectangle { Repeater { model: 2 - PathItem { + Shape { width: 200 height: 200 anchors.centerIn: parent - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: model.index === 0 ? "red" : "blue" diff --git a/examples/quick/pathitem/content/item17.qml b/examples/quick/shapes/content/item17.qml index f16608a7d9..6ee03ddd04 100644 --- a/examples/quick/pathitem/content/item17.qml +++ b/examples/quick/shapes/content/item17.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" @@ -62,11 +62,11 @@ Rectangle { text: "Loading" // Phase #1: Loader loads tiger.qml. After this we have our item. // Phase #2: With some backends (generic) the item will start async processing. Wait for this too. - visible: pathItemLoader.status != Loader.Ready || pathItemLoader.item.status === PathItem.Processing + visible: shapeLoader.status != Loader.Ready || shapeLoader.item.status === Shape.Processing } Loader { - id: pathItemLoader + id: shapeLoader anchors.fill: parent source: "tiger.qml" asynchronous: true diff --git a/examples/quick/pathitem/content/item2.qml b/examples/quick/shapes/content/item2.qml index dc65f51cf3..ca0026a1df 100644 --- a/examples/quick/pathitem/content/item2.qml +++ b/examples/quick/shapes/content/item2.qml @@ -49,16 +49,16 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { id: circ1 anchors.fill: parent - VisualPath { + ShapePath { fillColor: "transparent" // stroke only strokeWidth: 4 @@ -102,7 +102,7 @@ Rectangle { } } - PathItem { + Shape { id: circ2 anchors.fill: parent @@ -112,7 +112,7 @@ Rectangle { NumberAnimation { from: 0.0; to: 1.0; duration: 5000 } } - VisualPath { + ShapePath { strokeWidth: -1 // or strokeColor: "transparent" SequentialAnimation on fillColor { diff --git a/examples/quick/pathitem/content/item4.qml b/examples/quick/shapes/content/item4.qml index 4a3ccf049b..5f0704a48d 100644 --- a/examples/quick/pathitem/content/item4.qml +++ b/examples/quick/shapes/content/item4.qml @@ -49,18 +49,18 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { - id: pathItem + Shape { + id: shape anchors.fill: parent - VisualPath { + ShapePath { strokeWidth: 5 strokeColor: "blue" - strokeStyle: VisualPath.DashLine + strokeStyle: ShapePath.DashLine dashPattern: [ 1, 4, 4, 4 ] fillColor: "lightBlue" @@ -68,17 +68,17 @@ Rectangle { id: p property real xr: 70 property real yr: 30 - startX: pathItem.width / 2 - xr - startY: pathItem.height / 2 - yr + startX: shape.width / 2 - xr + startY: shape.height / 2 - yr PathArc { - x: pathItem.width / 2 + p.xr - y: pathItem.height / 2 + p.yr + x: shape.width / 2 + p.xr + y: shape.height / 2 + p.yr radiusX: p.xr; radiusY: p.yr useLargeArc: true } PathArc { - x: pathItem.width / 2 - p.xr - y: pathItem.height / 2 - p.yr + x: shape.width / 2 - p.xr + y: shape.height / 2 - p.yr radiusX: p.xr; radiusY: p.yr useLargeArc: true } diff --git a/examples/quick/pathitem/content/item5.qml b/examples/quick/shapes/content/item5.qml index 6a876fa1f7..44c301c4ec 100644 --- a/examples/quick/pathitem/content/item5.qml +++ b/examples/quick/shapes/content/item5.qml @@ -49,28 +49,28 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { width: 200 height: 150 anchors.centerIn: parent - VisualPath { + ShapePath { strokeWidth: 4 strokeColor: "red" - fillGradient: PathLinearGradient { + fillGradient: ShapeLinearGradient { x1: 20; y1: 20 x2: 180; y2: 130 - PathGradientStop { position: 0; color: "blue" } - PathGradientStop { position: 0.2; color: "green" } - PathGradientStop { position: 0.4; color: "red" } - PathGradientStop { position: 0.6; color: "yellow" } - PathGradientStop { position: 1; color: "cyan" } + ShapeGradientStop { position: 0; color: "blue" } + ShapeGradientStop { position: 0.2; color: "green" } + ShapeGradientStop { position: 0.4; color: "red" } + ShapeGradientStop { position: 0.6; color: "yellow" } + ShapeGradientStop { position: 1; color: "cyan" } } fillColor: "blue" // ignored with the gradient set - strokeStyle: VisualPath.DashLine + strokeStyle: ShapePath.DashLine dashPattern: [ 1, 4 ] Path { startX: 20; startY: 20 diff --git a/examples/quick/pathitem/content/item6.qml b/examples/quick/shapes/content/item6.qml index 10deafdcd7..334bc87fe0 100644 --- a/examples/quick/pathitem/content/item6.qml +++ b/examples/quick/shapes/content/item6.qml @@ -49,15 +49,15 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { width: 100 height: 100 anchors.centerIn: parent - VisualPath { + ShapePath { id: star strokeColor: "blue" fillColor: "magenta" @@ -80,12 +80,12 @@ Rectangle { } Timer { interval: 2000 - onTriggered: star.fillRule = (star.fillRule === VisualPath.OddEvenFill ? VisualPath.WindingFill : VisualPath.OddEvenFill) + onTriggered: star.fillRule = (star.fillRule === ShapePath.OddEvenFill ? ShapePath.WindingFill : ShapePath.OddEvenFill) repeat: true running: true } Text { anchors.right: parent.right - text: star.fillRule === VisualPath.OddEvenFill ? "OddEvenFill" : "WindingFill" + text: star.fillRule === ShapePath.OddEvenFill ? "OddEvenFill" : "WindingFill" } } diff --git a/examples/quick/pathitem/content/item7.qml b/examples/quick/shapes/content/item7.qml index 2840cd7c5a..c5efdc4f90 100644 --- a/examples/quick/pathitem/content/item7.qml +++ b/examples/quick/shapes/content/item7.qml @@ -49,26 +49,26 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { width: 120 height: 120 anchors.centerIn: parent - VisualPath { + ShapePath { id: joinTest strokeColor: "black" strokeWidth: 16 fillColor: "transparent" - capStyle: VisualPath.RoundCap + capStyle: ShapePath.RoundCap property int joinStyleIdx: 0 - property variant styles: [ VisualPath.BevelJoin, VisualPath.MiterJoin, VisualPath.RoundJoin ] + property variant styles: [ ShapePath.BevelJoin, ShapePath.MiterJoin, ShapePath.RoundJoin ] property variant styleTexts: [ "BevelJoin", "MiterJoin", "RoundJoin" ] joinStyle: styles[joinStyleIdx] diff --git a/examples/quick/pathitem/content/item8.qml b/examples/quick/shapes/content/item8.qml index 97304baa91..7e2a8bccfe 100644 --- a/examples/quick/pathitem/content/item8.qml +++ b/examples/quick/shapes/content/item8.qml @@ -49,24 +49,24 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" - PathItem { + Shape { anchors.centerIn: parent width: 200 height: 100 - VisualPath { + ShapePath { id: capTest strokeColor: "green" strokeWidth: 20 fillColor: "transparent" property int capStyleIdx: 0 - property variant styles: [ VisualPath.FlatCap, VisualPath.SquareCap, VisualPath.RoundCap ] + property variant styles: [ ShapePath.FlatCap, ShapePath.SquareCap, ShapePath.RoundCap ] property variant styleTexts: [ "FlatCap", "SquareCap", "RoundCap" ] capStyle: styles[capStyleIdx] diff --git a/examples/quick/pathitem/content/item9.qml b/examples/quick/shapes/content/item9.qml index a57b4484a8..dac352422a 100644 --- a/examples/quick/pathitem/content/item9.qml +++ b/examples/quick/shapes/content/item9.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { color: "lightGray" @@ -59,11 +59,11 @@ Rectangle { height: 100 anchors.centerIn: parent - PathItem { - id: pathItem + Shape { + id: shape anchors.fill: parent - VisualPath { + ShapePath { strokeWidth: 4 strokeColor: "black" fillColor: "transparent" @@ -88,11 +88,11 @@ Rectangle { loops: Animation.Infinite NumberAnimation { from: 0 - to: pathItem.width - cp.width + to: shape.width - cp.width duration: 5000 } NumberAnimation { - from: pathItem.width - cp.width + from: shape.width - cp.width to: 0 duration: 5000 } diff --git a/examples/quick/pathitem/content/pathitem.qml b/examples/quick/shapes/content/pathitem.qml index e1fae2bbe2..0933aa79b2 100644 --- a/examples/quick/pathitem/content/pathitem.qml +++ b/examples/quick/shapes/content/pathitem.qml @@ -56,8 +56,8 @@ Item { LauncherList { anchors.fill: parent Component.onCompleted: { - addExample("PathItem Gallery", "Simple path rendering examples", Qt.resolvedUrl("pathitemgallery.qml")) - addExample("Interactive PathItem", "Dynamic, interactive path rendering examples", Qt.resolvedUrl("pathiteminteract.qml")) + addExample("Shape Gallery", "Simple path rendering examples", Qt.resolvedUrl("pathitemgallery.qml")) + addExample("Interactive Shape", "Dynamic, interactive path rendering examples", Qt.resolvedUrl("pathiteminteract.qml")) addExample("Super- and multisampling", "Improving quality", Qt.resolvedUrl("pathitemsampling.qml")) addExample("Clip My Tiger!", "Clip examples, a.k.a. What Not To Do", Qt.resolvedUrl("pathitemtigers.qml")) } diff --git a/examples/quick/pathitem/content/pathitemgallery.qml b/examples/quick/shapes/content/pathitemgallery.qml index b4ec787e91..3b418639ee 100644 --- a/examples/quick/pathitem/content/pathitemgallery.qml +++ b/examples/quick/shapes/content/pathitemgallery.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { id: root @@ -68,63 +68,63 @@ Rectangle { id: pathGalleryModel ListElement { name: "Stroke and fill" - pathItemUrl: "item1.qml" + shapeUrl: "item1.qml" } ListElement { name: "Stroke or fill only" - pathItemUrl: "item2.qml" + shapeUrl: "item2.qml" } ListElement { name: "Dash pattern" - pathItemUrl: "item4.qml" + shapeUrl: "item4.qml" } ListElement { name: "Linear gradient" - pathItemUrl: "item5.qml" + shapeUrl: "item5.qml" } ListElement { name: "Fill rules" - pathItemUrl: "item6.qml" + shapeUrl: "item6.qml" } ListElement { name: "Join styles" - pathItemUrl: "item7.qml" + shapeUrl: "item7.qml" } ListElement { name: "Cap styles" - pathItemUrl: "item8.qml" + shapeUrl: "item8.qml" } ListElement { name: "Quadratic curve" - pathItemUrl: "item9.qml" + shapeUrl: "item9.qml" } ListElement { name: "Cubic curve" - pathItemUrl: "item10.qml" + shapeUrl: "item10.qml" } ListElement { name: "Elliptical arc" - pathItemUrl: "item11.qml" + shapeUrl: "item11.qml" } ListElement { name: "Gradient spread modes" - pathItemUrl: "item12.qml" + shapeUrl: "item12.qml" } ListElement { name: "Arc direction" - pathItemUrl: "item13.qml" + shapeUrl: "item13.qml" } ListElement { name: "Large/small arc" - pathItemUrl: "item14.qml" + shapeUrl: "item14.qml" } ListElement { name: "Arc rotation" - pathItemUrl: "item15.qml" + shapeUrl: "item15.qml" } ListElement { name: "Tiger" - pathItemUrl: "item17.qml" + shapeUrl: "item17.qml" } } @@ -143,7 +143,7 @@ Rectangle { width: parent.width height: parent.height - delegText.height Loader { - source: Qt.resolvedUrl(pathItemUrl) + source: Qt.resolvedUrl(shapeUrl) anchors.fill: parent } } @@ -176,11 +176,11 @@ Rectangle { Text { anchors.right: parent.right - PathItem { id: dummyPathItem; VisualPath { } } // used only to get the renderer type + Shape { id: dummyShape; ShapePath { } } // used only to get the renderer type color: "darkBlue" font.pointSize: 12 property variant rendererStrings: [ "Unknown", "Generic (QtGui triangulator)", "GL_NV_path_rendering", "Software (QPainter)" ] - text: "Active PathItem backend: " + rendererStrings[dummyPathItem.renderer] + text: "Active Shape backend: " + rendererStrings[dummyShape.renderer] SequentialAnimation on opacity { NumberAnimation { from: 1; to: 0; duration: 5000 } PauseAnimation { duration: 5000 } diff --git a/examples/quick/pathitem/content/pathiteminteract.qml b/examples/quick/shapes/content/pathiteminteract.qml index f0d2a95702..2e968eb56d 100644 --- a/examples/quick/pathitem/content/pathiteminteract.qml +++ b/examples/quick/shapes/content/pathiteminteract.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { id: root @@ -171,7 +171,7 @@ Rectangle { property variant funcs function genResizer(obj, x, y, xprop, yprop, color) { - var ma = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; Rectangle { id: rr; property variant obj; color: "' + color + '"; width: 20; height: 20;'+ + var ma = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; Rectangle { id: rr; property variant obj; color: "' + color + '"; width: 20; height: 20;'+ 'MouseArea { anchors.fill: parent; hoverEnabled: true;' + 'onEntered: color = "yellow"; onExited: color = "' + color + '";' + 'property bool a: false; onPressed: a = true; onReleased: a = false; ' + @@ -189,13 +189,13 @@ Rectangle { Component.onCompleted: { funcs = [ { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "transparent";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + 'PathLine { x: ' + x + ' + 1; y: ' + y + ' + 1 } } }', root, "dynamic_visual_path"); - pathItem.elements.push(p); + shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) @@ -211,14 +211,14 @@ Rectangle { } }, { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + 'PathCubic { x: ' + x + ' + 1; y: ' + y + ' + 1;' + 'control1X: ' + x + ' + 50; control1Y: ' + y + ' + 50; control2X: ' + x + ' + 150; control2Y: ' + y + ' + 50; } } }', root, "dynamic_visual_path"); - pathItem.elements.push(p); + shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) @@ -236,14 +236,14 @@ Rectangle { } }, { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import QtQuick.Shapes 1.0; ShapePath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + 'PathQuad { x: ' + x + ' + 1; y: ' + y + ' + 1;' + 'controlX: ' + x + ' + 50; controlY: ' + y + ' + 50 } } }', root, "dynamic_visual_path"); - pathItem.elements.push(p); + shape.elements.push(p); activePath = p; }, "move": function(x, y) { if (!activePath) @@ -275,8 +275,8 @@ Rectangle { } } - PathItem { - id: pathItem + Shape { + id: shape anchors.fill: parent elements: [] diff --git a/examples/quick/pathitem/content/pathitemsampling.qml b/examples/quick/shapes/content/pathitemsampling.qml index cb67897139..8928212aed 100644 --- a/examples/quick/pathitem/content/pathitemsampling.qml +++ b/examples/quick/shapes/content/pathitemsampling.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { id: root @@ -76,24 +76,24 @@ Rectangle { text: "Original" } - // A simple PathItem without anything special. + // A simple Shape without anything special. Rectangle { color: "lightGray" width: 400 height: 200 - PathItem { + Shape { x: 30 y: 20 width: 50 height: 50 scale: 2 - VisualPath { + ShapePath { strokeColor: "green" NumberAnimation on strokeWidth { from: 1; to: 20; duration: 5000 } fillColor: "transparent" - capStyle: VisualPath.RoundCap + capStyle: ShapePath.RoundCap Path { startX: 40; startY: 30 @@ -123,18 +123,18 @@ Rectangle { layer.smooth: true layer.textureSize: Qt.size(supersampledItem.width * 2, supersampledItem.height * 2) - PathItem { + Shape { x: 30 y: 20 width: 50 height: 50 scale: 2 - VisualPath { + ShapePath { strokeColor: "green" NumberAnimation on strokeWidth { from: 1; to: 20; duration: 5000 } fillColor: "transparent" - capStyle: VisualPath.RoundCap + capStyle: ShapePath.RoundCap Path { startX: 40; startY: 30 @@ -165,18 +165,18 @@ Rectangle { layer.smooth: true layer.samples: 4 - PathItem { + Shape { x: 30 y: 20 width: 50 height: 50 scale: 2 - VisualPath { + ShapePath { strokeColor: "green" NumberAnimation on strokeWidth { from: 1; to: 20; duration: 5000 } fillColor: "transparent" - capStyle: VisualPath.RoundCap + capStyle: ShapePath.RoundCap Path { startX: 40; startY: 30 diff --git a/examples/quick/pathitem/content/pathitemtigers.qml b/examples/quick/shapes/content/pathitemtigers.qml index 3ae31ba5bd..c55efdc403 100644 --- a/examples/quick/pathitem/content/pathitemtigers.qml +++ b/examples/quick/shapes/content/pathitemtigers.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 Rectangle { id: root @@ -86,7 +86,7 @@ Rectangle { SequentialAnimation on dy { loops: Animation.Infinite - running: loader1.status === Loader.Ready && loader1.item.status === PathItem.Ready + running: loader1.status === Loader.Ready && loader1.item.status === Shape.Ready NumberAnimation { from: 0 to: -scissorRect.centerY @@ -107,7 +107,7 @@ Rectangle { // With a more complex transformation (like rotation), stenciling is used // instead of scissoring, this is more expensive. It may also trigger a - // slower code path for PathItems, depending on the path rendering backend + // slower code path for Shapes, depending on the path rendering backend // in use, and may affect rendering quality as well. Rectangle { id: stencilRect diff --git a/examples/quick/pathitem/content/tiger.qml b/examples/quick/shapes/content/tiger.qml index b792195eec..5771797f4c 100644 --- a/examples/quick/pathitem/content/tiger.qml +++ b/examples/quick/shapes/content/tiger.qml @@ -49,16 +49,16 @@ ****************************************************************************/ import QtQuick 2.9 -import Qt.labs.pathitem 1.0 +import QtQuick.Shapes 1.0 -PathItem { - id: pathItem +Shape { + id: shape asynchronous: true anchors.fill: parent - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -70,7 +70,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -82,7 +82,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -94,7 +94,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -106,7 +106,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -118,7 +118,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -130,7 +130,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -142,7 +142,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -154,7 +154,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -166,7 +166,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -178,7 +178,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -190,7 +190,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.172 @@ -202,7 +202,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 1 @@ -298,7 +298,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeColor: "#000000" strokeWidth: 1 @@ -349,7 +349,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -374,7 +374,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#e87f3a" strokeWidth: -1 Path { @@ -399,7 +399,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ea8c4d" strokeWidth: -1 Path { @@ -424,7 +424,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ec9961" strokeWidth: -1 Path { @@ -449,7 +449,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#eea575" strokeWidth: -1 Path { @@ -474,7 +474,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f1b288" strokeWidth: -1 Path { @@ -499,7 +499,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f3bf9c" strokeWidth: -1 Path { @@ -524,7 +524,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f5ccb0" strokeWidth: -1 Path { @@ -549,7 +549,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f8d8c4" strokeWidth: -1 Path { @@ -574,7 +574,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#fae5d7" strokeWidth: -1 Path { @@ -599,7 +599,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#fcf2eb" strokeWidth: -1 Path { @@ -624,7 +624,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -649,7 +649,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -662,7 +662,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -676,7 +676,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -697,7 +697,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -708,7 +708,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -719,7 +719,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -730,7 +730,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -741,7 +741,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -752,7 +752,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -783,7 +783,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -804,7 +804,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#e5668c" strokeWidth: -1 Path { @@ -818,7 +818,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#b23259" strokeWidth: -1 Path { @@ -831,7 +831,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#a5264c" strokeWidth: -1 Path { @@ -850,7 +850,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ff727f" strokeColor: "#000000" strokeWidth: 1 @@ -869,7 +869,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -883,7 +883,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc3f4c" strokeWidth: -1 Path { @@ -898,7 +898,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#a51926" strokeWidth: 2 @@ -909,7 +909,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -921,7 +921,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -933,7 +933,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -945,7 +945,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -957,7 +957,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -969,7 +969,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -981,7 +981,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#a5264c" strokeWidth: 2 @@ -993,7 +993,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#a5264c" strokeWidth: 2 @@ -1005,7 +1005,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1019,7 +1019,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#a5264c" strokeWidth: 2 @@ -1029,7 +1029,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#a5264c" strokeWidth: 2 @@ -1039,7 +1039,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#b2b2b2" strokeWidth: -1 Path { @@ -1051,7 +1051,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1065,7 +1065,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1079,7 +1079,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1092,7 +1092,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1108,7 +1108,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1121,7 +1121,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1133,7 +1133,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1145,7 +1145,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1157,7 +1157,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffcc" strokeColor: "#000000" strokeWidth: 0.5 @@ -1169,7 +1169,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#e5e5b2" strokeWidth: -1 Path { @@ -1182,7 +1182,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#e5e5b2" strokeWidth: -1 Path { @@ -1195,7 +1195,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1211,7 +1211,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ea8e51" strokeWidth: -1 Path { @@ -1227,7 +1227,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#efaa7c" strokeWidth: -1 Path { @@ -1243,7 +1243,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f4c6a8" strokeWidth: -1 Path { @@ -1259,7 +1259,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f9e2d3" strokeWidth: -1 Path { @@ -1275,7 +1275,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -1291,7 +1291,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1303,7 +1303,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1320,7 +1320,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#99cc32" strokeWidth: -1 Path { @@ -1332,7 +1332,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#659900" strokeWidth: -1 Path { @@ -1344,7 +1344,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -1354,7 +1354,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1366,7 +1366,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1387,7 +1387,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -1408,7 +1408,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#eb955c" strokeWidth: -1 Path { @@ -1429,7 +1429,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f2b892" strokeWidth: -1 Path { @@ -1450,7 +1450,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#f8dcc8" strokeWidth: -1 Path { @@ -1471,7 +1471,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -1492,7 +1492,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1503,7 +1503,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1514,7 +1514,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#99cc32" strokeWidth: -1 Path { @@ -1525,7 +1525,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1575,7 +1575,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1594,7 +1594,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1608,7 +1608,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#323232" strokeWidth: -1 Path { @@ -1622,7 +1622,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#666666" strokeWidth: -1 Path { @@ -1636,7 +1636,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#999999" strokeWidth: -1 Path { @@ -1650,7 +1650,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1664,7 +1664,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -1678,7 +1678,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#992600" strokeWidth: -1 Path { @@ -1709,7 +1709,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1720,7 +1720,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1733,7 +1733,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1744,7 +1744,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1756,7 +1756,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -1767,7 +1767,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1836,7 +1836,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -1876,7 +1876,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1895,7 +1895,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1939,7 +1939,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1968,7 +1968,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -1999,7 +1999,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -2015,7 +2015,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cc7226" strokeWidth: -1 Path { @@ -2027,7 +2027,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2114,7 +2114,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#4c0000" strokeWidth: 2 @@ -2125,7 +2125,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#4c0000" strokeWidth: 2 @@ -2136,7 +2136,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#4c0000" strokeWidth: 2 @@ -2148,7 +2148,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#4c0000" strokeWidth: 2 @@ -2160,7 +2160,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2335,7 +2335,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#4c0000" strokeWidth: -1 Path { @@ -2348,7 +2348,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#99cc32" strokeWidth: -1 Path { @@ -2360,7 +2360,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#659900" strokeWidth: -1 Path { @@ -2372,7 +2372,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2384,7 +2384,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2392,7 +2392,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2415,7 +2415,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#e59999" strokeWidth: -1 Path { @@ -2435,7 +2435,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#b26565" strokeWidth: -1 Path { @@ -2455,7 +2455,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#992600" strokeWidth: -1 Path { @@ -2482,7 +2482,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -2495,7 +2495,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#992600" strokeWidth: -1 Path { @@ -2514,7 +2514,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2548,7 +2548,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2573,7 +2573,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2600,7 +2600,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2679,7 +2679,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2716,7 +2716,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2728,7 +2728,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2741,7 +2741,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2758,7 +2758,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2772,7 +2772,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -2802,7 +2802,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeWidth: -1 Path { @@ -2819,7 +2819,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -2840,7 +2840,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2857,7 +2857,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -2874,7 +2874,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2891,7 +2891,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2902,7 +2902,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2913,7 +2913,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2924,7 +2924,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2935,7 +2935,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2946,7 +2946,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2957,7 +2957,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2968,7 +2968,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2979,7 +2979,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -2990,7 +2990,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3001,7 +3001,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3012,7 +3012,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3023,7 +3023,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3034,7 +3034,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3045,7 +3045,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3056,7 +3056,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3067,7 +3067,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#992600" strokeWidth: -1 Path { @@ -3078,7 +3078,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#992600" strokeWidth: -1 Path { @@ -3089,7 +3089,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3101,7 +3101,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3135,7 +3135,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3152,7 +3152,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3164,7 +3164,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3176,7 +3176,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3188,7 +3188,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3200,7 +3200,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3212,7 +3212,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3224,7 +3224,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3236,7 +3236,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3248,7 +3248,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3265,7 +3265,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3282,7 +3282,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3293,7 +3293,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3304,7 +3304,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3315,7 +3315,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3326,7 +3326,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3337,7 +3337,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3348,7 +3348,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3359,7 +3359,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3370,7 +3370,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3381,7 +3381,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3393,7 +3393,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3409,7 +3409,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3421,7 +3421,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3433,7 +3433,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3445,7 +3445,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3457,7 +3457,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3469,7 +3469,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3481,7 +3481,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3493,7 +3493,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3505,7 +3505,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3517,7 +3517,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3529,7 +3529,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3541,7 +3541,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3553,7 +3553,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3565,7 +3565,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3577,7 +3577,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3589,7 +3589,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3601,7 +3601,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3613,7 +3613,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3625,7 +3625,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3637,7 +3637,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3649,7 +3649,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3661,7 +3661,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3673,7 +3673,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3685,7 +3685,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3697,7 +3697,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#ffffff" strokeColor: "#000000" strokeWidth: 0.1 @@ -3709,7 +3709,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3720,7 +3720,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3731,7 +3731,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3742,7 +3742,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3753,7 +3753,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3764,7 +3764,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#000000" strokeWidth: -1 Path { @@ -3775,7 +3775,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3786,7 +3786,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3801,7 +3801,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3816,7 +3816,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3833,7 +3833,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3846,7 +3846,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3862,7 +3862,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3874,7 +3874,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3899,7 +3899,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3911,7 +3911,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3922,7 +3922,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3933,7 +3933,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3944,7 +3944,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3958,7 +3958,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3969,7 +3969,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3981,7 +3981,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -3993,7 +3993,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4003,7 +4003,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4015,7 +4015,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4026,7 +4026,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4037,7 +4037,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4048,7 +4048,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "#cccccc" strokeWidth: -1 Path { @@ -4059,7 +4059,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#000000" strokeWidth: 1 @@ -4069,7 +4069,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#000000" strokeWidth: 1 @@ -4079,7 +4079,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#000000" strokeWidth: 1 @@ -4089,7 +4089,7 @@ PathItem { } } - VisualPath { + ShapePath { fillColor: "transparent" strokeColor: "#000000" strokeWidth: 1 diff --git a/examples/quick/pathitem/main.cpp b/examples/quick/shapes/main.cpp index 3a81c4da05..3a81c4da05 100644 --- a/examples/quick/pathitem/main.cpp +++ b/examples/quick/shapes/main.cpp diff --git a/examples/quick/pathitem/pathitem.pro b/examples/quick/shapes/shapes.pro index b0ff0537cf..1b953f56ca 100644 --- a/examples/quick/pathitem/pathitem.pro +++ b/examples/quick/shapes/shapes.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -RESOURCES += pathitem.qrc +RESOURCES += shapes.qrc OTHER_FILES += content/pathitem.qml \ content/pathitemgallery.qml \ content/pathiteminteract.qml \ @@ -25,5 +25,5 @@ OTHER_FILES += content/pathitem.qml \ content/item15.qml \ content/item17.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quick/pathitem +target.path = $$[QT_INSTALL_EXAMPLES]/quick/shapes INSTALLS += target diff --git a/examples/quick/pathitem/pathitem.qrc b/examples/quick/shapes/shapes.qrc index 533ba090bc..533ba090bc 100644 --- a/examples/quick/pathitem/pathitem.qrc +++ b/examples/quick/shapes/shapes.qrc |