summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2015-02-06 16:47:23 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2015-02-13 10:16:12 -0200
commit7b615428cfc4c0b912ba54ab3eaae690dce5d7a1 (patch)
treeb55634adf7e5bffcd99977f74cafe69db1535fd7
parentadeaa6128b665920eb98eb7c064f4aacbd74b873 (diff)
downloadmeta-qt5-7b615428cfc4c0b912ba54ab3eaae690dce5d7a1.tar.gz
qtwebchannel: Add recipes for 5.4.0 and Git
Signed-off-by: Stephan Binner <stephan.binner@basyskom.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/distro/include/qt5-versions.inc1
-rw-r--r--recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb3
-rw-r--r--recipes-qt/qt5/qtwebchannel.inc6
-rw-r--r--recipes-qt/qt5/qtwebchannel_5.4.0.bb5
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb4
5 files changed, 19 insertions, 0 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 3ea89163..09681cc5 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -27,6 +27,7 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
27PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" 27PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
28PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" 28PREFERRED_VERSION_qtwayland = "${QT5_VERSION}"
29PREFERRED_VERSION_qtwayland-native = "${QT5_VERSION}" 29PREFERRED_VERSION_qtwayland-native = "${QT5_VERSION}"
30PREFERRED_VERSION_qtwebchannel = "${QT5_VERSION}"
30PREFERRED_VERSION_qtwebengine = "${QT5_VERSION}" 31PREFERRED_VERSION_qtwebengine = "${QT5_VERSION}"
31PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" 32PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
32PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" 33PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 25a50039..6318dc67 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -90,6 +90,9 @@ RDEPENDS_${PN} += " \
90 qtwebsockets-dev \ 90 qtwebsockets-dev \
91 qtwebsockets-mkspecs \ 91 qtwebsockets-mkspecs \
92 qtwebsockets-qmlplugins \ 92 qtwebsockets-qmlplugins \
93 qtwebchannel-dev \
94 qtwebchannel-mkspecs \
95 qtwebchannel-qmlplugins \
93 qtxmlpatterns-dev \ 96 qtxmlpatterns-dev \
94 qtxmlpatterns-mkspecs \ 97 qtxmlpatterns-mkspecs \
95" 98"
diff --git a/recipes-qt/qt5/qtwebchannel.inc b/recipes-qt/qt5/qtwebchannel.inc
new file mode 100644
index 00000000..46c3c8a7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebchannel.inc
@@ -0,0 +1,6 @@
1require qt5.inc
2
3DEPENDS += "qtdeclarative qtwebsockets"
4
5LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7"
6LICENSE = "LGPL-2.1"
diff --git a/recipes-qt/qt5/qtwebchannel_5.4.0.bb b/recipes-qt/qt5/qtwebchannel_5.4.0.bb
new file mode 100644
index 00000000..c26e6bba
--- /dev/null
+++ b/recipes-qt/qt5/qtwebchannel_5.4.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "d11e86da2f585ea48f38d4107356edd7"
5SRC_URI[sha256sum] = "24eb0125198270f8595babb6c0df74dd13e0ccc8c8a5e665151cf68c3306594c"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
new file mode 100644
index 00000000..51176f68
--- /dev/null
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -0,0 +1,4 @@
1require qt5-git.inc
2require ${PN}.inc
3
4SRCREV = "86d77a900852691267f556fbde98406a12ee4310"