From ae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 11:01:04 +0300 Subject: Build Qt5 and all addons Use meta-qt5 layer to build Qt5, commercial addons and b2qt addons. Create new image and toolchain recipes with Qt5 content, so that the existing image and toolchain remain as-is without Qt5. Currently support only for imx6 targets. Change-Id: I398750dd1a62c6ff8ea216cfe364da273d8e9a77 Reviewed-by: Andy Nichols --- recipes-qt/qt5-addons/qtcharts_2.0.bb | 47 ++++++++++++++++ recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 43 ++++++++++++++ recipes-qt/qt5-addons/qtquick2drenderer.bb | 38 +++++++++++++ .../qt5-addons/qtquickenterprisecontrols_1.3.bb | 65 ++++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 46 +++++++++++++++ 5 files changed, 239 insertions(+) create mode 100644 recipes-qt/qt5-addons/qtcharts_2.0.bb create mode 100644 recipes-qt/qt5-addons/qtdatavisualization_1.2.bb create mode 100644 recipes-qt/qt5-addons/qtquick2drenderer.bb create mode 100644 recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb create mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb (limited to 'recipes-qt/qt5-addons') diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb new file mode 100644 index 0000000..4b350de --- /dev/null +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## 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 Charts" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative qtmultimedia" + +PACKAGES =+ "${PN}-designer" +DEBIAN_NOAUTONAME_${PN}-designer = "1" + +FILES_${PN}-designer = " \ + ${OE_QMAKE_PATH_QML}/QtCharts/designer \ + " + +RRECOMMENDS_${PN}-dev += "${PN}-designer" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb new file mode 100644 index 0000000..759bb44 --- /dev/null +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -0,0 +1,43 @@ +############################################################################# +## +## 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/datavisualizationglobal_p.h;md5=b6f0a53c44e6ba165a7d2dbd58832be5;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ + " + +# v1.2.0 +SRCREV = "62f90e25eec23cfac83985993f355feeac5b9f2c" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS += "qtbase qtdeclarative qtmultimedia" + +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ + " diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb new file mode 100644 index 0000000..59fd2fe --- /dev/null +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -0,0 +1,38 @@ +############################################################################# +## +## 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=d90663d6d3096fe0989549d52fec6554;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb new file mode 100644 index 0000000..7736d9b --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb @@ -0,0 +1,65 @@ +############################################################################# +## +## 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 Enterprise Controls" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/controls/Styles/Base/DialStyle.qml;md5=caa6d9db463140360114e567721eb580;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "ed6f7049e06717113d5f500595c5a1f2074fb13d" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +PACKAGES += "${PN}-fonts" + +RRECOMMENDS_${PN} = "${PN}-fonts" + +DEPENDS += "qtbase qtdeclarative qtgraphicaleffects" + +FILES_${PN}-fonts += " \ + /usr/lib/qt5/qml/QtQuick/Controls/Styles/Flat/fonts \ + " +FILES_${PN} += " \ + /opt/dashboard/bin/dashboard \ + /opt/gallery/bin/gallery \ + " +FILES_${PN}-dbg += " \ + /opt/dashboard/bin/.debug \ + /opt/gallery/bin/.debug \ + " +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*.qml \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/designer/* \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*/* \ + " +FILES_${PN}-examples += " \ + /opt/flat/bin/flat \ + " +FILES_${PN}-examples-dbg += " \ + /opt/flat/bin/.debug \ + " diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb new file mode 100644 index 0000000..40669e1 --- /dev/null +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -0,0 +1,46 @@ +############################################################################# +## +## 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 Virtual Keyboard" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17" + +inherit qt5-module + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "fa1aae525f94e9a870d0fcc0fb1be50648b76739" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative hunspell" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-xcb" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ + " -- cgit v1.2.3-54-g00ecf