diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-12 12:04:44 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-12 09:11:23 +0000 |
commit | 0bc53eb5f271cc692015e3a81a0d9f3546d37b43 (patch) | |
tree | 6061a76396cd767356413a877e0929f12de716b6 | |
parent | 1b356a70d61547992d51025e6a1b6edb48886bb6 (diff) | |
download | meta-qt5-0bc53eb5f271cc692015e3a81a0d9f3546d37b43.tar.gz |
qt5: update submodules
Update to Qt 5.11.2 RC2
Task-number: QTBUG-68980
Change-Id: I17ee727de76eeaaa0c973bf0759742f637f06539
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/qtdeclarative_git.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index aef0ecb7..0e0246fd 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 = "9da5b6f7432dc1d87cec94040ede69cb2f7ff537" | 212 | SRCREV = "2aa779e893bd7526c97a1968c6835204e4e985e2" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2ce9949d..5bb5fa59 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -135,4 +135,4 @@ do_install() { | |||
135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
136 | } | 136 | } |
137 | 137 | ||
138 | SRCREV = "9da5b6f7432dc1d87cec94040ede69cb2f7ff537" | 138 | SRCREV = "2aa779e893bd7526c97a1968c6835204e4e985e2" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index fd455125..b69560c4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -251,4 +251,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
251 | 251 | ||
252 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 252 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
253 | 253 | ||
254 | SRCREV = "9da5b6f7432dc1d87cec94040ede69cb2f7ff537" | 254 | SRCREV = "2aa779e893bd7526c97a1968c6835204e4e985e2" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 58382854..39095e59 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 = "72cc53b5ee8bd6821d0094ad0c5c45d7a269f943" | 36 | SRCREV = "0431e462dff57bc6a9010649c0d7f153d91cab2d" |
37 | 37 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |