diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-16 14:21:15 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-23 14:50:44 +0300 |
| commit | 62c79beede1a697b17a44dc11d89e70e618e52bf (patch) | |
| tree | b7d4c99da6c1acbc854fb801368eaa80f43ca2a5 | |
| parent | 0d0eca50521fcde987be3b97ffd29442db7435ff (diff) | |
| download | meta-qt5-62c79beede1a697b17a44dc11d89e70e618e52bf.tar.gz | |
qt5: update submodules
Update to latest content in Qt 5.12.5 branch
Task-number: QTBUG-77437
Change-Id: I9bb52d1887e579477fe4c9dcb3a4386423541659
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_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/qtknx_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtscxml_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 24109c18..b8552b23 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
| 195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
| 196 | 196 | ||
| 197 | SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" | 197 | SRCREV = "fc049052812bfa0b63af1f3c5fcadf1eb582e775" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e20be7c9..c32bb1dd 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -142,4 +142,4 @@ do_install() { | |||
| 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" | 145 | SRCREV = "fc049052812bfa0b63af1f3c5fcadf1eb582e775" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d8a7779f..7ea40b7c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -276,4 +276,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 276 | 276 | ||
| 277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 277 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 278 | 278 | ||
| 279 | SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" | 279 | SRCREV = "fc049052812bfa0b63af1f3c5fcadf1eb582e775" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 01f1eb33..8dcb8ec3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
| 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | SRCREV = "0647df8c88d4eaeedd19456b6e382308208e2be1" | 27 | SRCREV = "1adbf16f2526b797a70bccf21b1400451f9d4cbb" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index a8a1d646..ec4002d2 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 = "83d506042d7c4475578c860d7a9ccd07299da026" | 12 | SRCREV = "29d53975d559c9d2acce78167bacbe384e2d825a" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index e8199e01..fa7b28a4 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 = "667888bd8571061baebd03c2fdbc2804dbc92134" | 12 | SRCREV = "b4b171877ece7da3dab869fb40019d493560097c" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 5e7c55aa..7417b74b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -37,4 +37,4 @@ SRC_URI += "\ | |||
| 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 39 | 39 | ||
| 40 | SRCREV = "70ad769934d9c82e1d1dd11e96386ce59db7631e" | 40 | SRCREV = "9fba45e999f7c65f3cecf8fc914befd3d8b6db80" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index f7c580c9..ad442ad9 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
| @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
| 18 | 18 | ||
| 19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
| 20 | 20 | ||
| 21 | SRCREV = "52254ed121dde68293e99b96c4713d360ff6e90a" | 21 | SRCREV = "3f51fb011ccb5cc3697f23477ecb7b65b75f5a1a" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index be9f911b..5d44006c 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 = "db44c53e73479ee8ea98f911078b387735906f38" | 13 | SRCREV = "9bba89da77b73f016f22bc5d3f195d9c0212c7bc" |
| 14 | 14 | ||
| 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
| 16 | # 5.12.meta-qt5.2 | 16 | # 5.12.meta-qt5.2 |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index a02ae2de..eabca987 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
| 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | SRCREV = "a690022b7e56b2e36a95ef22b854af4c82c5fdc8" | 35 | SRCREV = "a8aa08498a7a16b40a4559034abb47e37d719ba4" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
| 38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index c7360ad3..821586a3 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
| 37 | 37 | ||
| 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 39 | 39 | ||
| 40 | SRCREV = "5ca9f28f4b272d3265b97c16029071a0070195a6" | 40 | SRCREV = "37a03693f22cba7a17a5e7bdc3c340e7646aa6ef" |
| 41 | 41 | ||
| 42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
| 43 | 43 | ||
