diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-03 11:58:46 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-25 13:03:28 +0000 |
commit | e2520ff76be49c5aa917741cc6a380fe1549e47d (patch) | |
tree | 6ec310e84eba500ac39a49c8df2ed0d22acd2dff /examples | |
parent | b334a92493c9e4956b0fc631610857d1b1cf5f6d (diff) |
Move PathItem to qt.labs
Change-Id: I1cd686cff60bd40fe2cbbc34f917fac7835b6b7d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'examples')
21 files changed, 43 insertions, 22 deletions
diff --git a/examples/quick/pathitem/content/item1.qml b/examples/quick/pathitem/content/item1.qml index 0c067d0273..e870c50a89 100644 --- a/examples/quick/pathitem/content/item1.qml +++ b/examples/quick/pathitem/content/item1.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item10.qml b/examples/quick/pathitem/content/item10.qml index 960a035ce2..599d41506f 100644 --- a/examples/quick/pathitem/content/item10.qml +++ b/examples/quick/pathitem/content/item10.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item11.qml b/examples/quick/pathitem/content/item11.qml index ad14728a61..4f26663e5f 100644 --- a/examples/quick/pathitem/content/item11.qml +++ b/examples/quick/pathitem/content/item11.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item12.qml b/examples/quick/pathitem/content/item12.qml index e64a2306cf..cf7e13dcca 100644 --- a/examples/quick/pathitem/content/item12.qml +++ b/examples/quick/pathitem/content/item12.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item13.qml b/examples/quick/pathitem/content/item13.qml index b6b7f33265..02dc6a719e 100644 --- a/examples/quick/pathitem/content/item13.qml +++ b/examples/quick/pathitem/content/item13.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item14.qml b/examples/quick/pathitem/content/item14.qml index b83722ad1b..320ba7cb47 100644 --- a/examples/quick/pathitem/content/item14.qml +++ b/examples/quick/pathitem/content/item14.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item15.qml b/examples/quick/pathitem/content/item15.qml index db6dd6e031..470e2f88f3 100644 --- a/examples/quick/pathitem/content/item15.qml +++ b/examples/quick/pathitem/content/item15.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item17.qml b/examples/quick/pathitem/content/item17.qml index 7f3f06cfb8..f16608a7d9 100644 --- a/examples/quick/pathitem/content/item17.qml +++ b/examples/quick/pathitem/content/item17.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item2.qml b/examples/quick/pathitem/content/item2.qml index bda87c8425..dc65f51cf3 100644 --- a/examples/quick/pathitem/content/item2.qml +++ b/examples/quick/pathitem/content/item2.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item4.qml b/examples/quick/pathitem/content/item4.qml index 095577eb66..4a3ccf049b 100644 --- a/examples/quick/pathitem/content/item4.qml +++ b/examples/quick/pathitem/content/item4.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item5.qml b/examples/quick/pathitem/content/item5.qml index d1a8447cc1..6a876fa1f7 100644 --- a/examples/quick/pathitem/content/item5.qml +++ b/examples/quick/pathitem/content/item5.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item6.qml b/examples/quick/pathitem/content/item6.qml index a0c9e32553..10deafdcd7 100644 --- a/examples/quick/pathitem/content/item6.qml +++ b/examples/quick/pathitem/content/item6.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item7.qml b/examples/quick/pathitem/content/item7.qml index 4f8d5770d4..2840cd7c5a 100644 --- a/examples/quick/pathitem/content/item7.qml +++ b/examples/quick/pathitem/content/item7.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item8.qml b/examples/quick/pathitem/content/item8.qml index a124b9b719..97304baa91 100644 --- a/examples/quick/pathitem/content/item8.qml +++ b/examples/quick/pathitem/content/item8.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/item9.qml b/examples/quick/pathitem/content/item9.qml index 4ad7a7f621..a57b4484a8 100644 --- a/examples/quick/pathitem/content/item9.qml +++ b/examples/quick/pathitem/content/item9.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { color: "lightGray" diff --git a/examples/quick/pathitem/content/pathitemgallery.qml b/examples/quick/pathitem/content/pathitemgallery.qml index 3ade189ffd..b4ec787e91 100644 --- a/examples/quick/pathitem/content/pathitemgallery.qml +++ b/examples/quick/pathitem/content/pathitemgallery.qml @@ -49,6 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { id: root diff --git a/examples/quick/pathitem/content/pathiteminteract.qml b/examples/quick/pathitem/content/pathiteminteract.qml index 219683b558..f0d2a95702 100644 --- a/examples/quick/pathitem/content/pathiteminteract.qml +++ b/examples/quick/pathitem/content/pathiteminteract.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { id: root @@ -170,7 +171,7 @@ Rectangle { property variant funcs function genResizer(obj, x, y, xprop, yprop, color) { - var ma = Qt.createQmlObject('import QtQuick 2.9; Rectangle { id: rr; property variant obj; color: "' + color + '"; width: 20; height: 20;'+ + 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;'+ 'MouseArea { anchors.fill: parent; hoverEnabled: true;' + 'onEntered: color = "yellow"; onExited: color = "' + color + '";' + 'property bool a: false; onPressed: a = true; onReleased: a = false; ' + @@ -188,7 +189,7 @@ Rectangle { Component.onCompleted: { funcs = [ { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + 'strokeColor: "black"; fillColor: "transparent";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + @@ -210,7 +211,7 @@ Rectangle { } }, { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + @@ -235,7 +236,7 @@ Rectangle { } }, { "start": function(x, y) { - var p = Qt.createQmlObject('import QtQuick 2.9; VisualPath {' + + var p = Qt.createQmlObject('import QtQuick 2.9; import Qt.labs.pathitem 1.0; VisualPath {' + 'strokeColor: "black"; fillColor: "' + (root.fill ? 'green' : 'transparent') + '";'+ 'strokeWidth: ' + widthSlider.value + ';' + 'Path { startX: ' + x + '; startY: ' + y + ';' + diff --git a/examples/quick/pathitem/content/pathitemsampling.qml b/examples/quick/pathitem/content/pathitemsampling.qml index 15c9cbe323..cb67897139 100644 --- a/examples/quick/pathitem/content/pathitemsampling.qml +++ b/examples/quick/pathitem/content/pathitemsampling.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { id: root diff --git a/examples/quick/pathitem/content/pathitemtigers.qml b/examples/quick/pathitem/content/pathitemtigers.qml index 36bff891c6..3ae31ba5bd 100644 --- a/examples/quick/pathitem/content/pathitemtigers.qml +++ b/examples/quick/pathitem/content/pathitemtigers.qml @@ -48,7 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 // to get PathItem +import QtQuick 2.9 +import Qt.labs.pathitem 1.0 Rectangle { id: root diff --git a/examples/quick/pathitem/content/tiger.qml b/examples/quick/pathitem/content/tiger.qml index a9f4abe46a..b792195eec 100644 --- a/examples/quick/pathitem/content/tiger.qml +++ b/examples/quick/pathitem/content/tiger.qml @@ -49,6 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 +import Qt.labs.pathitem 1.0 PathItem { id: pathItem diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 445dfb0fab..bb5af35dc6 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -24,6 +24,7 @@ SUBDIRS = quick-accessibility \ imageresponseprovider \ window \ particles \ + pathitem \ demos #OpenGL Support Required |