diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-15 20:55:56 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-16 06:11:55 +0000 |
| commit | b84881444814a361fcc17e7eb34407fb175541da (patch) | |
| tree | 178dce1f8a095b4565e61ad74a4769627eb79e28 | |
| parent | 8e64c2ba2a909bc42bc6b41b1a5b9c7a0ee438c3 (diff) | |
| download | meta-qt5-5.11.1.tar.gz | |
qt5: update submodulesv5.11.1
Update to Qt 5.11.1 RC
Task-number: QTBUG-68389
Change-Id: Id6d3b4180aab73d2d84d2c3fce0712b095e931c0
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/qtdeclarative_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtpurchasing_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebchannel_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebview_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtx11extras_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtxmlpatterns_git.bb | 2 |
17 files changed, 18 insertions, 18 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 03b17233..6985058a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -209,4 +209,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 209 | do_generate_qt_environment_file[umask] = "022" | 209 | do_generate_qt_environment_file[umask] = "022" |
| 210 | addtask generate_qt_environment_file after do_install before do_package | 210 | addtask generate_qt_environment_file after do_install before do_package |
| 211 | 211 | ||
| 212 | SRCREV = "67227aeffdf94be8d177309d27291d5b3247586c" | 212 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index d02da832..bf5b0129 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
| @@ -36,6 +36,6 @@ do_configure_prepend() { | |||
| 36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | SRCREV = "0c587292a3b5dd62a194a48f099a3ceb7a90a1d9" | 39 | SRCREV = "3b4a9b50618210c08dc08ae0e2dcf3b8d495eccf" |
| 40 | 40 | ||
| 41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d635bbc7..50845f1e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -134,4 +134,4 @@ do_install() { | |||
| 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | SRCREV = "67227aeffdf94be8d177309d27291d5b3247586c" | 137 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8ec8cd59..57b60392 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -243,4 +243,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 243 | 243 | ||
| 244 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 244 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 245 | 245 | ||
| 246 | SRCREV = "67227aeffdf94be8d177309d27291d5b3247586c" | 246 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 1e39ff97..69e90570 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
| 32 | 32 | ||
| 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
| 34 | 34 | ||
| 35 | SRCREV = "14c64a5b53b23d3caf7d8f603cac6ebc05f4186f" | 35 | SRCREV = "68e282f510d5f5ee490ffdb0500f90e0932b8cef" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 4ee56f0a..2a34a245 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 = "aa020d45c40206fc6ec3fdd4f589fe5d276d2791" | 21 | SRCREV = "e954783bd9cdf490a7ffb2a9dc02f1031890d4ea" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index a474d5ba..70218296 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
| @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | 9 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "e1e3241fbb5ee1cb31651f118d5a2a1c1c1a06b8" | 12 | SRCREV = "e2faddd5d6b6ef468fed7ce129d849130c957da4" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index ca7886c3..8aa26be8 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
| @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | 9 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "21aefc65d56d97284bf8122fb1b91726c1ae9768" | 12 | SRCREV = "b8a9a5aff7e924826c85029a9f919b5247752d5c" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 43995dc2..2a788bec 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
| 12 | 12 | ||
| 13 | SRCREV = "c34d30ba5ebe6a5b2eeed9c744ec0a4483483361" | 13 | SRCREV = "f08a50d9d7b8ddec27fdd9f070fb7e54108570e4" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index fad6dc3d..1e2b2205 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "167bc3f1dce02292fb1e3a70bc30ea7485061dbb" | 13 | SRCREV = "1e9e0c388920af7e56fa9fb0fef81e23e9807062" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 2a6a0fd0..de8ad962 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
| @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "1d462a792a17ec1c09b632ea6ad0adad15ad4cbe" | 27 | SRCREV = "cc454911ac5aec527379c2e51259583071d21ca9" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 390e9179..913d8c69 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
| @@ -30,4 +30,4 @@ DEPENDS += "qtbase" | |||
| 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
| 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 32 | 32 | ||
| 33 | SRCREV = "14c24e363af3708b6d212cdad6df8832d7a526d0" | 33 | SRCREV = "18c09cd0a3dd8143256fbe22b8e62aea346d17f1" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 8ba2e73e..3fc1465f 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
| 14 | 14 | ||
| 15 | SRCREV = "9ef5f29cce4baea2d7f98104852e0277f3e51148" | 15 | SRCREV = "2ff27bf60e3bda8335adc557abd6486c144cb948" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 1085affa..9a71b7c2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -158,8 +158,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 158 | file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 158 | file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
| 159 | " | 159 | " |
| 160 | 160 | ||
| 161 | SRCREV_qtwebengine = "8483cfa6b039feb780995cee2f3b0878b131fa1d" | 161 | SRCREV_qtwebengine = "fe73e5405716531e85440772f69ad74943024eee" |
| 162 | SRCREV_chromium = "94a0b51526ced8d7649e78ec035b3aa1949c8547" | 162 | SRCREV_chromium = "bad02200c68d7e0c758dc4f1805e58d0e03fdea9" |
| 163 | SRCREV = "${SRCREV_qtwebengine}" | 163 | SRCREV = "${SRCREV_qtwebengine}" |
| 164 | 164 | ||
| 165 | SRCREV_FORMAT = "qtwebengine_chromium" | 165 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index b887f41d..90917fb5 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 = "cfa232c26b5b68145a305d3a51e83ee03de3a4b9" | 22 | SRCREV = "8515dd6e203e596c7dbec5b950b3354a8012dd72" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 05c000ff..c53e0b21 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
| @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 13 | 13 | ||
| 14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
| 15 | 15 | ||
| 16 | SRCREV = "1c36cf756c90c24ea3fc5c402399891222f79d91" | 16 | SRCREV = "a3570e9bab1abe5c80e00ddc10ae688c654c1427" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 0384c65e..d75e47d5 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
| @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 14 | 14 | ||
| 15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
| 16 | 16 | ||
| 17 | SRCREV = "73c6356de441e0a0e59a4e4a7b59640d5b56e8db" | 17 | SRCREV = "f6b06147b0065b1809c0a081fceec6f524dec2a4" |
| 18 | 18 | ||
| 19 | BBCLASSEXTEND =+ "native nativesdk" | 19 | BBCLASSEXTEND =+ "native nativesdk" |
| 20 | 20 | ||
