From 31e2c60c611e51296b9595aa4390b02c6fcdeafd Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Wed, 13 Jan 2016 16:46:02 +0200
Subject: qtdeclarative-render2d: repository is now public

Change-Id: Ic76e9c4adccf2d08a4e305b6d164c63ce19084aa
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb |  1 +
 .../packagegroups/packagegroup-b2qt-qt5-modules.bb |  1 +
 .../qt5-addons/qtdeclarative-render2d_git.bb       | 32 ++++++++++++++++++
 recipes-qt/qt5-addons/qtquick2drenderer.bb         | 38 ----------------------
 4 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
 delete mode 100644 recipes-qt/qt5-addons/qtquick2drenderer.bb

diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index b2cdc6f..a638ce7 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -40,6 +40,7 @@ RDEPENDS_${PN} += " \
     qtcanvas3d \
     qtconnectivity-dev \
     qtdeclarative-dev \
+    qtdeclarative-render2d-dev \
     qtdeclarative-staticdev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 3e3c089..f565b24 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -36,6 +36,7 @@ RDEPENDS_${PN} += " \
     qtconnectivity \
     qtdatavis3d \
     qtdeclarative \
+    qtdeclarative-render2d \
     qtdeclarative-tools \
     qtgraphicaleffects \
     qtimageformats \
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
new file mode 100644
index 0000000..8753c62
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Qt Quick 2D Rendender"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17"
+
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+
+SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3"
+
+DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb
deleted file mode 100644
index 423b215..0000000
--- a/recipes-qt/qt5-addons/qtquick2drenderer.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-DESCRIPTION = "Qt Quick 2D Rendender"
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17"
-
-inherit qt5-module sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-scenegraph-raster;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
-    "
-
-SRCREV = "849ee6c976ba3574b1856eb9d16c2bd740a6d2e3"
-BRANCH = "5.6"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "qtbase qtdeclarative"
-- 
cgit v1.2.3-54-g00ecf