diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-14 15:22:58 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-15 05:46:30 +0000 |
| commit | 467cd895622b0249b6bd82909fc192b35cdcde6d (patch) | |
| tree | af0de60588ecb7cc1fd3c811862e9e8c809caf00 | |
| parent | 48eb6e64c764f3b7093c177936712a7b073e3912 (diff) | |
| download | meta-qt5-467cd895622b0249b6bd82909fc192b35cdcde6d.tar.gz | |
qt5: update submodules
Update submodules to Qt 5.11.0 rc2 [v2]:
qtbase, qtknx, qtopcua & qttools updated
Task-number: QTBUG-67590
Change-Id: Ica099a0dfe67b68824ba4e1c3a430457e988e9f9
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/qtknx_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 7045b8b0..5971eeb4 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 = "a7863a58545a6c59eaf16f36905efcbf0e4f94f9" | 212 | SRCREV = "6eef81ee1c82f934e14d47047d8b6103b8755321" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index c30ef302..0d7e598f 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 = "a7863a58545a6c59eaf16f36905efcbf0e4f94f9" | 137 | SRCREV = "6eef81ee1c82f934e14d47047d8b6103b8755321" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d72b6029..cc002b34 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 = "a7863a58545a6c59eaf16f36905efcbf0e4f94f9" | 246 | SRCREV = "6eef81ee1c82f934e14d47047d8b6103b8755321" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index c2a9953b..aa9db332 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 = "603b1815b4a0d2a8aede7f49287015b0be20aa24" | 12 | SRCREV = "fa91849f5d2a320bbc09067bc2aea42fdb8cfd23" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 49b86894..d7d55814 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 = "57207cb95ccc81cce357b1b00953b831c6561bd8" | 13 | SRCREV = "862d205b6c2ef29f464231b7f7db63bf2cbb07ec" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d31b6885..867f9c54 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
| 29 | 29 | ||
| 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
| 31 | 31 | ||
| 32 | SRCREV = "9894e604dff2bf9fe9961b475a678938316154f1" | 32 | SRCREV = "36e7b1925e2ff2df167280eb3592b99697a1234d" |
| 33 | 33 | ||
| 34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
| 35 | 35 | ||
