summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-06-06 10:25:33 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-06-06 12:22:22 +0000
commit2cafe6bd533b2b645c0695c9fae5e294f76730da (patch)
treede989a8297f22e53ed2cff45e610c1d2de6da8e4
parentd93318a741228ea0275985fe21291761d89900e8 (diff)
downloadmeta-boot2qt-2cafe6bd533b2b645c0695c9fae5e294f76730da.tar.gz
qt5: update submodules
qtdeclarative-render2d is now in meta-qt5, so use bbappend instead. Change-Id: I81dee336084fc1050b21c288284db1bb1654b61a Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--recipes-qt/qt5-addons/qtquickcompiler_git.bb5
-rw-r--r--recipes-qt/qt5/qt3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdeclarative-render2d_git.bbappend (renamed from recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb)12
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttools_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bbappend2
10 files changed, 11 insertions, 22 deletions
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
index c15ebd4..fc08950 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
@@ -34,11 +34,10 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a154
34inherit qt5-module 34inherit qt5-module
35 35
36SRC_URI = " \ 36SRC_URI = " \
37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ 37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
38 " 38 "
39 39
40SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15" 40SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f"
41BRANCH = "5.6"
42 41
43S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"
44 43
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend
index d1fa4f8..41e5765 100644
--- a/recipes-qt/qt5/qt3d_git.bbappend
+++ b/recipes-qt/qt5/qt3d_git.bbappend
@@ -33,4 +33,4 @@ SRC_URI_append_class-target = " \
33 file://0001-Remove-qgltf.patch \ 33 file://0001-Remove-qgltf.patch \
34 " 34 "
35 35
36SRCREV = "fb07d54eb4ea70faee73fb0a6fef2c672d5ba478" 36SRCREV = "a398469e66e3a953097857c60655c41bf291a06b"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend
index fc11a53..b208484 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bbappend
+++ b/recipes-qt/qt5/qtconnectivity_git.bbappend
@@ -27,5 +27,5 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "241ef04afe45967a736802d4f4ce89d79e4b6d1b" 30SRCREV = "23a207fb56bf21aeb598ddd914159333f28f8a00"
31 31
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend
index 164a5de..f468494 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bbappend
+++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "02af08a705ada1ca2dac839a026a816a8e70def5" 30SRCREV = "57832c490a6f34f6ede7caa864dde20abda94358"
diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
index 42c8e1d..b6b620b 100644
--- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
@@ -27,14 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30DESCRIPTION = "Qt Quick 2D Rendender" 30SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6"
31LICENSE = "QtEnterprise"
32LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=1f253bc897054feebffbaf70ecd49af4;beginline=1;endline=17"
33
34inherit qt5-module
35require recipes-qt/qt5/qt5-git.inc
36
37QT_MODULE_BRANCH = "dev"
38SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"
39
40DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index 16561f8..8f117a1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)
31 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" 32 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
33 33
34SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e" 34SRCREV = "48086a7573268774fab346d6fde0c9137ba1bf4e"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
index 40448f5..2886e20 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "1736925ad72808ecf461a803197dd7ad0ce2994b" 30SRCREV = "6b0fc95d094258d968b57f48c03f10be2fe8ac26"
diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend
index b735ff0..730635a 100644
--- a/recipes-qt/qt5/qttools_git.bbappend
+++ b/recipes-qt/qt5/qttools_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "1d0a02f8a227286dbc383f890a1fd61e9139c223" 30SRCREV = "5716e18a8f63593e8e64fce0b44d714fddfe7298"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend
index 40606c2..3ba915d 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bbappend
+++ b/recipes-qt/qt5/qtwayland-native_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "2a593a98fd2d58f942e9171f3d5b0c851fefe4aa" 30SRCREV = "0918ffa9f32a6ff59f101ffd80c2325f2fbd0e6d"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend
index 26d889d..e525d81 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bbappend
+++ b/recipes-qt/qt5/qtwebchannel_git.bbappend
@@ -27,4 +27,4 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "4fda82b66e17cc03e6b08f1afd135069cfef09b7" 30SRCREV = "18d8ca185819d6d81a9f21858ff2d60bf6fd05f8"