From 65c426a60fb9514eb3809934a8d4e60c359c1105 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 Jan 2016 16:36:56 +0200 Subject: qtdatavis3d: repository is now public Change-Id: Ib7308d25f58f890eee6c99829ae636cabc8aaede Reviewed-by: David Schulz Reviewed-by: Teemu Holappa --- ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 2 +- recipes-qt/qt5-addons/qtdatavis3d_git.bb | 32 ++++++++++++++++++ recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 39 ---------------------- 4 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 recipes-qt/qt5-addons/qtdatavis3d_git.bb delete mode 100644 recipes-qt/qt5-addons/qtdatavisualization_1.2.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 287af3a..b2cdc6f 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -60,6 +60,6 @@ RDEPENDS_${PN} += " \ \ b2qt-utils-dev \ qtcharts-dev \ - qtdatavisualization-dev \ + qtdatavis3d-dev \ qtvirtualkeyboard-dev \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 4ab0fd6..3e3c089 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -34,7 +34,7 @@ RDEPENDS_${PN} += " \ qtcanvas3d \ qtcharts \ qtconnectivity \ - qtdatavisualization \ + qtdatavis3d \ qtdeclarative \ qtdeclarative-tools \ qtgraphicaleffects \ diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb new file mode 100644 index 0000000..5d1aad0 --- /dev/null +++ b/recipes-qt/qt5-addons/qtdatavis3d_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 Data Visualization" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17" + +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc + +SRCREV = "25fa07daf70b8b00cd6832a9e180dfa517da4b8b" + +DEPENDS += "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb deleted file mode 100644 index 3cc8083..0000000 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ /dev/null @@ -1,39 +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 Data Visualization" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal.h;md5=80b80e41be7c22f5b90fc96163b7d1bf;beginline=1;endline=17" - -inherit qt5-module sdk-sources - -SRC_URI = " \ - git://codereview.qt-project.org/qt/tqtc-qtdatavis3d;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtDataVisualization/1.2/Src \ - " - -# v1.2.2 -SRCREV = "25fa07daf70b8b00cd6832a9e180dfa517da4b8b" -BRANCH = "master" - -S = "${WORKDIR}/git" - -DEPENDS += "qtbase qtdeclarative qtmultimedia" -- cgit v1.2.3-54-g00ecf