diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-18 09:52:55 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-23 21:47:01 +0300 |
commit | 42e5e8418ed1ad592220285a3270468bcbc617c5 (patch) | |
tree | 9ce5e7a43960dba3214c55ae1ecc3c9c08e6264d | |
parent | a16976979e929618c8fc873b798d78fc82393cab (diff) | |
download | meta-qt5-42e5e8418ed1ad592220285a3270468bcbc617c5.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.14.0 branch.
Task-number: QTBUG-77876
Change-Id: I9e654236787fe17974d90d3dc60a1c551287d77d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
36 files changed, 49 insertions, 49 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index aece580c..82edc4c6 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 = "9864d2c6f3b628ca9f07a56b197e77bd43931cca" | 196 | SRCREV = "bc35941dbbf6cbd09805a2217ecb062c565855ad" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 9686768a..a132226b 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "7814da64942c4566e2fa9c9e2bd2a1e169e7fab9" | 39 | SRCREV = "42e11789e4a2de7729ccba30dc465ca48e09e5e7" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 186e2cff..eba8f0c2 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -140,4 +140,4 @@ do_install() { | |||
140 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 140 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
141 | } | 141 | } |
142 | 142 | ||
143 | SRCREV = "9864d2c6f3b628ca9f07a56b197e77bd43931cca" | 143 | SRCREV = "bc35941dbbf6cbd09805a2217ecb062c565855ad" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6e32af6c..d892a809 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
275 | 275 | ||
276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
277 | 277 | ||
278 | SRCREV = "9864d2c6f3b628ca9f07a56b197e77bd43931cca" | 278 | SRCREV = "bc35941dbbf6cbd09805a2217ecb062c565855ad" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 32e46473..e149a9aa 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd3" | 11 | SRCREV = "98fe0e8db097919ffc727194749753cc8dcb52f4" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 502364f3..0404e51c 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,bluez5" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "2c6dcc643f29c212fca0ead123a377e96b9a17c9" | 22 | SRCREV = "87617df961fd5e7a1d7c3e3ceba4125ca7090f9e" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 461165aa..639305ab 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "548b93d6e5e70afeb220502170a51cc2e2510139" | 11 | SRCREV = "a1d12993858a3da5077c5edce7449618ce8f392d" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 0f8d1fbc..ac43709c 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 = "90a706dffb944e7d18b8b199b1cea68633e2b172" | 31 | SRCREV = "3fb574d01c106e786f9a43ef1e0d781e156d52fa" |
32 | 32 | ||
33 | BBCLASSEXTEND =+ "native nativesdk" | 33 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index efa139eb..7fb38a88 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "ea0457b8058191b4bb22477c7b51975a70af0b0e" | 17 | SRCREV = "2e83eda3e897edd440ed064f8cf12890e8a54591" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index b2af445f..20b956d0 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "cb8c28031c60c708721ef8a875076f12a630e6b9" | 21 | SRCREV = "551b1fe346c5704e5ca22d8d4e8b34478f38e2fa" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 37683ad2..60aa83d5 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "44000c87d352e4f88b7eea3d441a807b755698d3" | 28 | SRCREV = "ac8a82f5ffd08b0b9f8f76be29158ce7e113cb46" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index a7d4670d..a32b65bc 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -36,7 +36,7 @@ SRC_URI += " \ | |||
36 | ${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 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV_qtlocation = "08972f5e65c8d7286fe1435cb85be4574ac3772f" | 39 | SRCREV_qtlocation = "0cb5a2f498b38331c6c3bdd5d53777acadd5feea" |
40 | SRCREV_qtlocation-mapboxgl = "5233c75b3f6c73623c5473b2d6573f31f3ddb4b7" | 40 | SRCREV_qtlocation-mapboxgl = "5233c75b3f6c73623c5473b2d6573f31f3ddb4b7" |
41 | 41 | ||
42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 0c87063d..b0bf10a9 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 = "954534fb5542dda1ab1a1730f7ef57c250d9f10c" | 12 | SRCREV = "b83a7de714b3c4df0ed5465294102160a2639f24" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 89ef41bb..aec4c86c 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 = "38e49d060d13ef592f457a5d6640d68a2d9c6b06" | 40 | SRCREV = "034c731008254970f4d577e8718f32d939ddfbab" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index b56b3706..00f25bac 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "272ea7f508d8ee30311c08c07c6e0501f17338c2" | 12 | SRCREV = "9226e90f4a39cfbaff5db05cb0360681acfa76b9" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index b53e014d..b056c9fc 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 = "2e5ffcf29ac1867ab07e93684e4243e71d7ae8f7" | 21 | SRCREV = "56c1d5548289321a1c13689ffcc2d4dc752ee697" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 18b27b9f..abbf7e9a 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "bc6d56861b93bd87958baa3384c3cbd895f1c3f9" | 13 | SRCREV = "597d84162559291072eacc2c61aa872f01ef442a" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 6c0065ac..3845144f 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ | |||
21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 21 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRCREV_qtquick3d = "fa5d0b457c5e31cea5a1bddad574d4505c93174f" | 24 | SRCREV_qtquick3d = "6df1e06b8fbf6df18ae21814d0d6976bb75e54a9" |
25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" | 25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 95322e1e..b1503d10 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "e0b2a30357a6fbb2d52fcba69f0a5059d3b065b8" | 13 | SRCREV = "0cab878ae937451c8b53262cde7a05e7feaec0a6" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 007f7d69..146fdaa9 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "6ab10d971d7d98eeaa50203c24d53da35cfe2187" | 20 | SRCREV = "5b9e833e77b269a41f51aa65c238c8b23a82b7a7" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 511f9207..a8e78958 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "acb75637a429d1a540b0b86b35554f75bd13b44b" | 28 | SRCREV = "81f93064cb74a6acffc04d218d5d8fe16ce26e25" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 31f57180..a342798d 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "1de1f080ef4b37576843bd59a8aa3e484c918820" | 39 | SRCREV = "0779791684b3094d329cfe8e0c8550c091be1eed" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index d02d0a8f..89b77582 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 = "07c62001b55b515629062ccc51e8c12aaa7d4eec" | 13 | SRCREV = "99349b791bfbd54b5cdb290dea6656949b50963d" |
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/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index b8c43d8a..2d57b383 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "c4519ffcfc009d4ffbfa77bfa1b7c9749b9fe7dc" | 15 | SRCREV = "f9e12e11274f0969b8829f5e0718960ee0b90114" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 113328f0..8497799a 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "47eaa2b1a58db67643f32cb1d8779c5b199ccb10" | 14 | SRCREV = "be05a82406c2b82d0b2bc0aa4866df31a46c2352" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 2598df97..0108eca3 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "78bfc0a93077dafb217f854782e14b65a5746949" | 15 | SRCREV = "ba7eb7316d8586c6a30e759c26fed30c5b0ff5ae" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e8c85a33..c91da44e 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "d8ccc52c038a033b20c96041b998322a907521c4" | 15 | SRCREV = "a7cb54082e3fd47758b8f17b0ece15a2f8c38aa5" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1f70e686..364ec1c4 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ | |||
39 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \ | 39 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \ |
40 | " | 40 | " |
41 | 41 | ||
42 | SRCREV = "01d70a3150191445b043873db2a19474983a411e" | 42 | SRCREV = "9e1bc9718d66afe9bf5bbb92d5bb6d3538dc037b" |
43 | 43 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 44 | BBCLASSEXTEND = "native nativesdk" |
45 | 45 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cd1c0d53..2b296b3c 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 = "559f4fa005b140105e29e09c96084f59148565c5" | 40 | SRCREV = "d8c19df22a1ff6ee40373a96fa12183acfc1b452" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch index f464f4a6..0b312809 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | |||
@@ -1,23 +1,23 @@ | |||
1 | From 5a1d55ce93a51b35b7c409bcf778a6439ab34906 Mon Sep 17 00:00:00 2001 | 1 | From f8e556db0c49f31881ebefdb2ab28d2b22fccd5c Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 | 3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 |
4 | Subject: [PATCH] musl: allow build without glibc | 4 | Subject: [PATCH] musl: allow build without glibc |
5 | 5 | ||
6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
7 | --- | 7 | --- |
8 | mkspecs/features/functions.prf | 2 +- | 8 | src/buildtools/config/support.pri | 2 +- |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf | 11 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri |
12 | index a301929..15e7110 100644 | 12 | index 5bdd808..eda498f 100644 |
13 | --- a/mkspecs/features/functions.prf | 13 | --- a/src/buildtools/config/support.pri |
14 | +++ b/mkspecs/features/functions.prf | 14 | +++ b/src/buildtools/config/support.pri |
15 | @@ -167,7 +167,7 @@ defineTest(isWebEngineCoreBuild) { | 15 | @@ -89,7 +89,7 @@ defineTest(qtwebengine_checkErrorForLinux) { |
16 | return(false) | 16 | return(false) |
17 | } | 17 | } |
18 | 18 | ||
19 | - !qtConfig(webengine-system-glibc) { | 19 | - !qtConfig(webengine-system-glibc) { |
20 | + false:!qtConfig(webengine-system-glibc) { | 20 | + false:!qtConfig(webengine-system-glibc) { |
21 | skipBuild("A suitable version >= 2.27 of libc could not be found.") | 21 | qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") |
22 | return(false) | 22 | return(false) |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index fd4faecd..d80d0cb2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -172,7 +172,7 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
173 | " | 173 | " |
174 | 174 | ||
175 | SRCREV_qtwebengine = "8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58" | 175 | SRCREV_qtwebengine = "16192598a84eaf9ac9a50b7cca6ac5e4c21bb5e8" |
176 | SRCREV_chromium = "feccbb4ea7fa685dcd013f5a3f6c14ea768636c9" | 176 | SRCREV_chromium = "feccbb4ea7fa685dcd013f5a3f6c14ea768636c9" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 178 | ||
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 5fce7d7f..8425a40c 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "e51341cf20447c42a62281e633513837058f62e5" | 21 | SRCREV = "64b88a7fbd90cb1f78eacf2a8fd1104876c32836" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 034ac5ca..59deb30b 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "87a5151adfc9947f2ab2e560fea7da0088eb59c6" | 14 | SRCREV = "04c23a295d757c43c16f911fd25c912a78b57b62" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index eabce2d4..fb59be1b 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "fb2a2003fbb41ac91b319afb56f290b415befb64" | 22 | SRCREV = "dac0467b50f9dd5795f26cb2df7970785d658bfc" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 32855887..b5f40bec 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "a0443bd723601205c8cc4666dd89be5a32decf98" | 15 | SRCREV = "58ee6c5866440b69f6a9d7a58f0fbeefbd578bc1" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 80c000fc..cea507bb 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "85bec28aafc05c9b1fe3428832ee18af82747123" | 28 | SRCREV = "af8b508de56fee70d6f3c971254fcb848805d18f" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||