summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-08-11 11:37:19 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-14 09:25:20 +0000
commitc3e7bf0baf42e16c9a59ab47c83a050faa5820d4 (patch)
treef795de31ee137e647c823e3c2b8e8e24008787ff
parentb72dbdfcb6e1e3c520de216cda4d0893d6372bd2 (diff)
downloadmeta-qt5-c3e7bf0baf42e16c9a59ab47c83a050faa5820d4.tar.gz
qt5: update submodules
Qt 5.6.3 (snapshot 2) Change-Id: Icd4a041a4923be083d93efafd6c1c3e58e441614 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
11 files changed, 12 insertions, 12 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 47f7fff1..0277fa35 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -239,4 +239,4 @@ fakeroot do_generate_qt_environment_file() {
239 239
240addtask generate_qt_environment_file after do_install before do_package 240addtask generate_qt_environment_file after do_install before do_package
241 241
242SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3" 242SRCREV = "3e379bcc799edb6a78bc8cea093a278dbe32f33c"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 608b41a0..69fdb7f6 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -117,4 +117,4 @@ do_install() {
117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
118} 118}
119 119
120SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3" 120SRCREV = "3e379bcc799edb6a78bc8cea093a278dbe32f33c"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index cd94344a..1ed528ae 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -253,4 +253,4 @@ sysroot_stage_dirs_append() {
253 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 253 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
254} 254}
255 255
256SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3" 256SRCREV = "3e379bcc799edb6a78bc8cea093a278dbe32f33c"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index d117c859..e76deeb1 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "825c0c8d54a7009c6af5cb73736138150cc5cc63" 28SRCREV = "f7bfd2adb82e3a8797e168a37287510e4a004b2e"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5e0e6620..13286f7c 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() {
39 39
40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
41 41
42SRCREV = "caa273e3bc6a2bece76c190b4135103eb7bbeab9" 42SRCREV = "7ed7f10b9e3a345b6125602910b02afd7fdeb026"
43 43
44BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 09ab0cae..7888b9ce 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "d2b7d77b7d882e00a2c1bb938a04493e4b1b6d44" 32SRCREV = "0a38932510ffaad5387b7e86c7ca70aed8af5c5b"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 0062489f..69d1ee3e 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ SRC_URI += " \
17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
18" 18"
19 19
20SRCREV = "a1149499650fe989016160941a715020aad42893" 20SRCREV = "9fc3fcb5a827196dee8c7afbd70a4c2361c65107"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 59a380e0..baa6e85b 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "a4f656126803b6cfac8ac4b442ee975562145b73" 34SRCREV = "705d06c2841ef5d9ebda954c112fc8f1e32ec2cb"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 6e40b9e2..99aac015 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "e0ee24efee5472d353accb70fa86274bc34a34db" 117SRCREV = "df316bf7e6508ae1360247feb08780a77ea4210e"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 001e8ca0..05ea7b48 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "18a53cef73eed59cddd7962d4e4aa8fbf7d3170a" 18SRCREV = "64306392ce3a7751bfb58e1352b212ad5cba8aec"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index c368bbdd..17d846f7 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -118,10 +118,10 @@ SRC_URI += " \
118 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 118 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
119" 119"
120 120
121SRCREV_qtwebengine = "e4ea5215ff40e5e179aeeeaa320e588a25c3ec13" 121SRCREV_qtwebengine = "04fa812ef5025aa991d9a79dd26e9ecfcb3182a1"
122# This is in git submodule, but we're using latest in 45-based 122# This is in git submodule, but we're using latest in 45-based
123# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" 123# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
124SRCREV_chromium = "a0b159a148a8de89ad44fa2d64e488fd9a4aee87" 124SRCREV_chromium = "cb094c05c5f06489fa64412e7f5d9e194a3f9495"
125SRCREV = "${SRCREV_qtwebengine}" 125SRCREV = "${SRCREV_qtwebengine}"
126 126
127SRCREV_FORMAT = "qtwebengine_chromium" 127SRCREV_FORMAT = "qtwebengine_chromium"