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>

14 files changed, 43 insertions, 2 deletions

diff --git a/tests/auto/quick/qquickpathitem/data/pathitem1.qml b/tests/auto/quick/qquickpathitem/data/pathitem1.qml
index 885ec7d323..d4bc133d86 100644
--- a/tests/auto/quick/qquickpathitem/data/pathitem1.qml
+++ b/tests/auto/quick/qquickpathitem/data/pathitem1.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import tst_qquickpathitem 1.0
 
 PathItem {
 }
diff --git a/tests/auto/quick/qquickpathitem/data/pathitem2.qml b/tests/auto/quick/qquickpathitem/data/pathitem2.qml
index 9f4a3b5957..fcef43a4fe 100644
--- a/tests/auto/quick/qquickpathitem/data/pathitem2.qml
+++ b/tests/auto/quick/qquickpathitem/data/pathitem2.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import tst_qquickpathitem 1.0
 
 PathItem {
     VisualPath { }
diff --git a/tests/auto/quick/qquickpathitem/data/pathitem3.qml b/tests/auto/quick/qquickpathitem/data/pathitem3.qml
index 69a56dd488..3d2b9f6229 100644
--- a/tests/auto/quick/qquickpathitem/data/pathitem3.qml
+++ b/tests/auto/quick/qquickpathitem/data/pathitem3.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import tst_qquickpathitem 1.0
 
 Item {
     width: 200
diff --git a/tests/auto/quick/qquickpathitem/data/pathitem4.qml b/tests/auto/quick/qquickpathitem/data/pathitem4.qml
index 74f0ca7408..3f756336c4 100644
--- a/tests/auto/quick/qquickpathitem/data/pathitem4.qml
+++ b/tests/auto/quick/qquickpathitem/data/pathitem4.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import tst_qquickpathitem 1.0
 
 Item {
     width: 200
diff --git a/tests/auto/quick/qquickpathitem/qquickpathitem.pro b/tests/auto/quick/qquickpathitem/qquickpathitem.pro
index 909fbd8027..4b70a38436 100644
--- a/tests/auto/quick/qquickpathitem/qquickpathitem.pro
+++ b/tests/auto/quick/qquickpathitem/qquickpathitem.pro
@@ -9,5 +9,27 @@ include (../shared/util.pri)
 
 TESTDATA = data/*
 
+HEADERS += \
+    ../../../../src/imports/pathitem/qquickpathitem_p.h \
+    ../../../../src/imports/pathitem/qquickpathitem_p_p.h \
+    ../../../../src/imports/pathitem/qquickpathitemgenericrenderer_p.h \
+    ../../../../src/imports/pathitem/qquickpathitemsoftwarerenderer_p.h
+
+SOURCES += \
+    ../../../../src/imports/pathitem/qquickpathitem.cpp \
+    ../../../../src/imports/pathitem/qquickpathitemgenericrenderer.cpp \
+    ../../../../src/imports/pathitem/qquickpathitemsoftwarerenderer.cpp
+
+qtConfig(opengl) {
+    HEADERS += \
+        ../../../../src/imports/pathitem/qquicknvprfunctions_p.h \
+        ../../../../src/imports/pathitem/qquicknvprfunctions_p_p.h \
+        ../../../../src/imports/pathitem/qquickpathitemnvprrenderer_p.h
+
+    SOURCES += \
+        ../../../../src/imports/pathitem/qquicknvprfunctions.cpp \
+        ../../../../src/imports/pathitem/qquickpathitemnvprrenderer.cpp
+}
+
 QT += core-private gui-private  qml-private quick-private testlib
 qtHaveModule(widgets): QT += widgets
diff --git a/tests/auto/quick/qquickpathitem/tst_qquickpathitem.cpp b/tests/auto/quick/qquickpathitem/tst_qquickpathitem.cpp
index d18df11c96..230d82a864 100644
--- a/tests/auto/quick/qquickpathitem/tst_qquickpathitem.cpp
+++ b/tests/auto/quick/qquickpathitem/tst_qquickpathitem.cpp
@@ -33,7 +33,7 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQml/qqmlincubator.h>
-#include <QtQuick/private/qquickpathitem_p.h>
+#include "../../../../src/imports/pathitem/qquickpathitem_p.h"
 
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
@@ -61,6 +61,13 @@ tst_QQuickPathItem::tst_QQuickPathItem()
 {
     // Force the software backend to get reliable rendering results regardless of the hw and drivers.
     QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+
+    const char *uri = "tst_qquickpathitem";
+    qmlRegisterType<QQuickPathItem>(uri, 1, 0, "PathItem");
+    qmlRegisterType<QQuickVisualPath>(uri, 1, 0, "VisualPath");
+    qmlRegisterType<QQuickPathGradientStop>(uri, 1, 0, "PathGradientStop");
+    qmlRegisterUncreatableType<QQuickPathGradient>(uri, 1, 0, "PathGradient", QQuickPathGradient::tr("PathGradient is an abstract base class"));
+    qmlRegisterType<QQuickPathLinearGradient>(uri, 1, 0, "PathLinearGradient");
 }
 
 void tst_QQuickPathItem::initValues()
diff --git a/tests/manual/pathitem/pathitemtest.qml b/tests/manual/pathitem/pathitemtest.qml
index 53fe0ed452..2327464614 100644
--- a/tests/manual/pathitem/pathitemtest.qml
+++ b/tests/manual/pathitem/pathitemtest.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/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml
index 6b714caf51..797aa9ca46 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml
index b1e1ed741b..5e22ebbf53 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml
index f2e2247bb9..4b7d68ac3a 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml
index a8a27a6bf7..30b33094fa 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml
index e6480b37c5..44e243b00f 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml
index 8953505786..26ee8439a7 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml
index 912c3d62f0..536e3b1898 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml
+++ b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.9
+import Qt.labs.pathitem 1.0
 
 Item {
     width: 320