diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-02 09:31:59 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-04 05:36:07 +0000 |
commit | d625f3f9776789543f7f5ff639fa7b663e228578 (patch) | |
tree | 6312c3859e65e2a3788e7abc8919abcac943c513 | |
parent | 48da0529c59c245c53f982ebcc674750669b5979 (diff) | |
download | meta-qt5-d625f3f9776789543f7f5ff639fa7b663e228578.tar.gz |
qt5: update submodules
Update Qt submodules to 5.9.2 RC
Change-Id: I5ba3e4a141e8712a4bfea8ed79c56232356c66c5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscxml_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialport_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsystems_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebsockets_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebview_git.bb | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 98690370..0f1376fa 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() { | |||
197 | 197 | ||
198 | addtask generate_qt_environment_file after do_install before do_package | 198 | addtask generate_qt_environment_file after do_install before do_package |
199 | 199 | ||
200 | SRCREV = "807fa90b32466fd936704459884c12214d8a254f" | 200 | SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 48820c16..6f8ab717 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -37,6 +37,6 @@ do_configure_prepend() { | |||
37 | ${S}/src/quick3d/imports/input/importsinput.pro | 37 | ${S}/src/quick3d/imports/input/importsinput.pro |
38 | } | 38 | } |
39 | 39 | ||
40 | SRCREV = "72e80520d36802672eca1e93bc6c6019e6f5ffc3" | 40 | SRCREV = "143b721249af92fc27f48fb01914195516f7a087" |
41 | 41 | ||
42 | BBCLASSEXTEND += "native nativesdk" | 42 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 04e63068..5a37a9e4 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -114,4 +114,4 @@ do_install() { | |||
114 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | 114 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} |
115 | } | 115 | } |
116 | 116 | ||
117 | SRCREV = "807fa90b32466fd936704459884c12214d8a254f" | 117 | SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d8aeca89..3ae2dfc1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
222 | 222 | ||
223 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 223 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
224 | 224 | ||
225 | SRCREV = "807fa90b32466fd936704459884c12214d8a254f" | 225 | SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 030a40f3..ca9866f1 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "ae21b2574c0000aac6e3b10f7e11ebd1da567ffd" | 22 | SRCREV = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c00895be..67d6b910 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -33,6 +33,6 @@ do_install_append_class-nativesdk() { | |||
33 | 33 | ||
34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
35 | 35 | ||
36 | SRCREV = "960bebd61f70c39e2fbce9f67b889cd64f48cea7" | 36 | SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee" |
37 | 37 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index f2b7d2e9..8f70bc0b 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "8c4488a77d5fe4fed26b22dbc91b746a77cd0562" | 21 | SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index a0d6a0dd..52dd34a8 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 26 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "0d42a2e44491980e6803d6aee6c7d2e83acadec4" | 29 | SRCREV = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 3e8599a2..fc60d601 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "16956a965817311fbc9d80ffbee74eb5d9ea00e0" | 13 | SRCREV = "3caae998c8c1770cd96cadba24d89a60005c5fe7" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 |
16 | # 5.9.meta-qt5.2 | 16 | # 5.9.meta-qt5.2 |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 9530eea0..0425e434 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "f9f02db5fc6ca4da97be63a67c469af49f97ab3b" | 18 | SRCREV = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 7c155a28..911a7098 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -30,4 +30,4 @@ do_install_append() { | |||
30 | 30 | ||
31 | QT_MODULE_BRANCH = "dev" | 31 | QT_MODULE_BRANCH = "dev" |
32 | 32 | ||
33 | SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" | 33 | SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 2a4f256d..80896939 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | 32 | ||
33 | SRCREV = "ad18484063a41328d0e72c75cda151128977e0d8" | 33 | SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d" |
34 | 34 | ||
35 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
36 | 36 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6f32aaee..d89c8320 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -162,7 +162,7 @@ SRC_URI_append_libc-musl = "\ | |||
162 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 162 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
163 | " | 163 | " |
164 | 164 | ||
165 | SRCREV_qtwebengine = "fb639faa8898ce6b8fbcc8870ec316114a79f975" | 165 | SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87" |
166 | SRCREV_chromium = "02fb09feaed516d49c50f51172d687adf382e49e" | 166 | SRCREV_chromium = "02fb09feaed516d49c50f51172d687adf382e49e" |
167 | SRCREV = "${SRCREV_qtwebengine}" | 167 | SRCREV = "${SRCREV_qtwebengine}" |
168 | 168 | ||
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index cb68b46c..0f72d63a 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "0f32f4efc5a9a8b33369013c2ba6c27c78498cf2" | 14 | SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 2823c8b1..79089aec 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "01ff5c0d5f937577cfd2391a43af4180f2a484bb" | 22 | SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25" |