diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-18 15:29:00 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-23 07:09:09 +0000 |
| commit | 70e4a1c9c9a7e264e710f4e6c2abbc0fcd0727cd (patch) | |
| tree | 6e41c84ad5213395f746769dd3157ae7d3fc1237 | |
| parent | b676fea3938221781bf81a8cfcf40c7d2046f8d8 (diff) | |
| download | meta-qt5-70e4a1c9c9a7e264e710f4e6c2abbc0fcd0727cd.tar.gz | |
qt5: update submodules
Update to latest content in Qt 5.12.1 branch (RC)
Task-number: QTBUG-72255
Change-Id: I54a8b32d7dc198a057d29825b58d45d932739ef6
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/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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 799181dc..251fff8b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 193 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
| 194 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
| 195 | 195 | ||
| 196 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 196 | SRCREV = "7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3bb6ae9a..83706dca 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -139,4 +139,4 @@ do_install() { | |||
| 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 142 | SRCREV = "7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a7867563..5c958fe3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -253,4 +253,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 253 | 253 | ||
| 254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 255 | 255 | ||
| 256 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 256 | SRCREV = "7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2d5637ad..a70baed0 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 = "1b4bf7b4e82f5f320da9f78ef4c23a3330c41737" | 22 | SRCREV = "736d3e14bbf28c90ff51c017ceea6c2bc0c7698d" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ab697e1e..ced5a08b 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 = "95c050bb22f65ba5d8488b4a036f1c7a1223b138" | 27 | SRCREV = "a566125b9fcc023237b442e5b9a838d40455c8fe" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |