Skip to content

Commit

Permalink
qt5: update submodules
Browse files Browse the repository at this point in the history
qtdeclarative-render2d is now in meta-qt5, so use bbappend instead.

Change-Id: I81dee336084fc1050b21c288284db1bb1654b61a
Reviewed-by: Teemu Holappa <[email protected]>
  • Loading branch information
sapiippo committed Jun 6, 2016
1 parent d93318a commit 2cafe6b
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 22 deletions.
5 changes: 2 additions & 3 deletions recipes-qt/qt5-addons/qtquickcompiler_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=02f6307ab0d6c4bd38a154
inherit qt5-module

SRC_URI = " \
git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
"

SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15"
BRANCH = "5.6"
SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f"

S = "${WORKDIR}/git"

Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qt3d_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ SRC_URI_append_class-target = " \
file://0001-Remove-qgltf.patch \
"

SRCREV = "fb07d54eb4ea70faee73fb0a6fef2c672d5ba478"
SRCREV = "a398469e66e3a953097857c60655c41bf291a06b"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtconnectivity_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
##
############################################################################

SRCREV = "241ef04afe45967a736802d4f4ce89d79e4b6d1b"
SRCREV = "23a207fb56bf21aeb598ddd914159333f28f8a00"

2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtdatavis3d_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
##
############################################################################

SRCREV = "02af08a705ada1ca2dac839a026a816a8e70def5"
SRCREV = "57832c490a6f34f6ede7caa864dde20abda94358"
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,4 @@
##
############################################################################

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

QT_MODULE_BRANCH = "dev"
SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62"

DEPENDS = "qtbase qtdeclarative"
SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtmultimedia_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)
${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"

SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e"
SRCREV = "48086a7573268774fab346d6fde0c9137ba1bf4e"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtquickcontrols2_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
##
############################################################################

SRCREV = "1736925ad72808ecf461a803197dd7ad0ce2994b"
SRCREV = "6b0fc95d094258d968b57f48c03f10be2fe8ac26"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qttools_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
##
############################################################################

SRCREV = "1d0a02f8a227286dbc383f890a1fd61e9139c223"
SRCREV = "5716e18a8f63593e8e64fce0b44d714fddfe7298"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtwayland-native_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
##
############################################################################

SRCREV = "2a593a98fd2d58f942e9171f3d5b0c851fefe4aa"
SRCREV = "0918ffa9f32a6ff59f101ffd80c2325f2fbd0e6d"
2 changes: 1 addition & 1 deletion recipes-qt/qt5/qtwebchannel_git.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
##
############################################################################

SRCREV = "4fda82b66e17cc03e6b08f1afd135069cfef09b7"
SRCREV = "18d8ca185819d6d81a9f21858ff2d60bf6fd05f8"

0 comments on commit 2cafe6b

Please sign in to comment.