diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-12 09:33:50 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-12 21:22:29 +0200 |
commit | f642a5460c334aec475839b1d8bb50edbf9b14a7 (patch) | |
tree | c8a43eb1308bcde2d6d2f87fccb8ea0b7fcbe2f5 | |
parent | 2f93925b83e0edf932e2451b159a486eaa9d4086 (diff) | |
download | meta-qt5-f642a5460c334aec475839b1d8bb50edbf9b14a7.tar.gz |
qt5: update submodulesv5.15.0-alpha
Update to Qt 5.15.0 Alpha [pt2]. Amends commit
2f93925b83e0edf932e2451b159a486eaa9d4086.
Task-number: QTBUG-80823
Change-Id: Ie47db10301b368434404968e57f1f1859fe9f62f
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 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_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 8858218a..dfcf7ed1 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "e541a3f099798e2258116d3c031b35274d789783" | 198 | SRCREV = "c08b0cec2f3acc29e86beba4b1de26caf04bebfd" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ce834bc8..63c3ba5d 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 = "e541a3f099798e2258116d3c031b35274d789783" | 145 | SRCREV = "c08b0cec2f3acc29e86beba4b1de26caf04bebfd" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f37bd10e..a59ffce0 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -292,4 +292,4 @@ sed -i \ | |||
292 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 292 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
293 | } | 293 | } |
294 | 294 | ||
295 | SRCREV = "e541a3f099798e2258116d3c031b35274d789783" | 295 | SRCREV = "c08b0cec2f3acc29e86beba4b1de26caf04bebfd" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index de4e0d6a..1f2a5f58 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() { | |||
28 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 28 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
29 | } | 29 | } |
30 | 30 | ||
31 | SRCREV = "dba4e7dae4c08ff08fbf1858e8bc5cc2b4cbb553" | 31 | SRCREV = "8e822e981d91e688799c8670f11dfdf6aaf9e0d1" |
32 | 32 | ||
33 | BBCLASSEXTEND =+ "native nativesdk" | 33 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index c15a0fa6..8c9e320b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -35,7 +35,7 @@ SRC_URI += " \ | |||
35 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 35 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV_qtlocation = "614d67be158e3ef8443c1b7f3126303cfcf4becc" | 38 | SRCREV_qtlocation = "a4469cad4041f21e640efa9ca5d0b192dd702955" |
39 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" | 39 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" |
40 | 40 | ||
41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 5ca466c1..a91fc4ab 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
@@ -22,7 +22,7 @@ FILES_${PN}-qmlplugins += " \ | |||
22 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 22 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRCREV_qtquick3d = "4005e300d25e18bd0c3fae756ccf34b4b4f560f6" | 25 | SRCREV_qtquick3d = "7ea11dc3853af5a4daadbcd2ec89a21824da8c6d" |
26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
27 | 27 | ||
28 | SRCREV_FORMAT = "qtquick3d_assimp" | 28 | SRCREV_FORMAT = "qtquick3d_assimp" |