mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-07 06:34:39 +02:00
qt5: update to Qt 5.12.6
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
committed by
Martin Jansa
parent
1718712803
commit
20331bd6b6
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
|
||||
do_generate_qt_environment_file[umask] = "022"
|
||||
addtask generate_qt_environment_file after do_install before do_package
|
||||
|
||||
SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017"
|
||||
SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "bbe0805bfddcb61f7c07a6454793e76f142a32bc"
|
||||
SRCREV = "b77712dd95adb6644e9af3bf98a2a6ebc5a52ec4"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.12.5+git${SRCPV}"
|
||||
PV = "5.12.6+git${SRCPV}"
|
||||
|
||||
@@ -142,4 +142,4 @@ do_install() {
|
||||
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
|
||||
}
|
||||
|
||||
SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017"
|
||||
SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
|
||||
|
||||
@@ -15,12 +15,12 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.pri b/configure.pri
|
||||
index 09c34af4ee..8079233627 100644
|
||||
index b109192..cccbf1c 100644
|
||||
--- a/configure.pri
|
||||
+++ b/configure.pri
|
||||
@@ -839,10 +839,10 @@ defineTest(qtConfOutput_preparePaths) {
|
||||
"static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
|
||||
"" \
|
||||
@@ -836,10 +836,10 @@ defineTest(qtConfOutput_preparePaths) {
|
||||
|
||||
$${currentConfig}.output.qconfigSource = \
|
||||
"/* Installation Info */" \
|
||||
- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
|
||||
+ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \
|
||||
|
||||
@@ -294,4 +294,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017"
|
||||
SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS = "qtdeclarative"
|
||||
|
||||
SRCREV = "ae8749c175b64222190cdebc6d0b2eceddc0bfc8"
|
||||
SRCREV = "51e8dc59d87463f32dab0e401e9ae17615c7b790"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "dd65e383b2f900b8e661b678c746cd71fdef697e"
|
||||
SRCREV = "969fc5bf94e8e0e6cd86c79c38e11074de235273"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "0a5bf7a41e5c2c4a36efeace83444ceaee79c945"
|
||||
SRCREV = "33f5988eadf1b748d75deec8bc12afc1d47ea52f"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "3858190b2b2e71a7b63e9976da2b22f1c342e3b3"
|
||||
SRCREV = "2b753d7caa9f780d6a76829db516e3fb859c3353"
|
||||
|
||||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "7b47350736f46c59d81238d3d6284358a652983b"
|
||||
SRCREV = "179c4b689d1a7b9e9edb71ddf545dc237bca6704"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "09de115d0d31fbc62d16aef821f96b487dbf5169"
|
||||
SRCREV = "39b7df80c9b58dffc7a6e9e68b99e1b9f78ed2e0"
|
||||
|
||||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
|
||||
# http://errors.yoctoproject.org/Errors/Build/44912/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "06116f294697e052edc31ac35dc58f46bf493913"
|
||||
SRCREV = "7ce8cd84f7f8ce8d0377019f7087b2352b5626e7"
|
||||
|
||||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "53f8fd57b698b97aded363700306fe61c4b9ea17"
|
||||
SRCREV = "dad286f15b75f36f37d4523ac86696e5133e58cb"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "ee2f01020005b1baa63de918be1dc75ae581f7b1"
|
||||
SRCREV = "c8786b87a1d9cbe2d6ee4234064beba93803d18d"
|
||||
|
||||
@@ -36,7 +36,7 @@ SRC_URI += " \
|
||||
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
|
||||
"
|
||||
|
||||
SRCREV_qtlocation = "1de7ca6175bd3e4a542a038a089cfd73c9eaa27a"
|
||||
SRCREV_qtlocation = "ad359c55d36f39c7f243bee8960d490772bfe84e"
|
||||
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "b4b171877ece7da3dab869fb40019d493560097c"
|
||||
SRCREV = "b70017b66d5a3d8daeaa7ab2a91c910f0535ffa3"
|
||||
|
||||
@@ -37,4 +37,4 @@ SRC_URI += "\
|
||||
# http://errors.yoctoproject.org/Errors/Build/44914/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "0b77a2d9852d3aa8c8c21a68be8a1d6805197155"
|
||||
SRCREV = "53a507b30befc40a4d06a1620e85bb4a5b1bf40a"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "773a0dc64c73c1584fd1ed8fe081a9d9b1b1e4d5"
|
||||
SRCREV = "ecdeaac31d2cdebda5d7b06a0224fd34649a7375"
|
||||
|
||||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "3f51fb011ccb5cc3697f23477ecb7b65b75f5a1a"
|
||||
SRCREV = "0e608b65ac435ce9d816543d5c8346059a650d55"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "acdb9438f7ae94b29bab9c261ec20e18ec80390d"
|
||||
SRCREV = "ceb003e074cdbb6f2429dd3f4ddcf995382d199e"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "6a3356dfd8a98131d2912d16c666419d5eeaa10e"
|
||||
SRCREV = "ed92154c712b0e54caa5baa72d832d7f8286307f"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "b37db1f31b3248e9d32d0ccbb42e77035fa5b340"
|
||||
SRCREV = "8f8d9b7015cd05e936d560f097cbce42eb375de9"
|
||||
|
||||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "c76dfdc3eafe1d2129761951c3ca6970699badfb"
|
||||
SRCREV = "76d6a13889514b03a1878e19b56eb1e6f17d1b90"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
|
||||
# http://errors.yoctoproject.org/Errors/Build/44915/
|
||||
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||
|
||||
SRCREV = "1701681e4f8ee3b17ca39f563a24065ee43b3a52"
|
||||
SRCREV = "c2e02e863c3867f5d038731f429cc3a03f3cc3bc"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "f416efc6e2ea2fff4357cd87f4458e009ac5d595"
|
||||
SRCREV = "9ed16e4621ae705947d5e04ade450f1859ef86c5"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
|
||||
# 5.12.meta-qt5.2
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42"
|
||||
SRCREV = "8fd13b71e50d0935af69e70f1961ac8194cb6fb3"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "c8645af35accdfadfa2b29cd897f77b6e15704c8"
|
||||
SRCREV = "4347caecbd0b2d02074a033eabf7d114ad7ca5f6"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "b1413c11b999aadca302c1b12dd90a12b55a1f12"
|
||||
SRCREV = "f3bf6e0cc9c7b8c9d1ef249cf8043c465d7e8186"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "cd2d1245b8237aba4f64d8336b39e2635665564f"
|
||||
SRCREV = "f8eb5228da5805161701477682489baf9d5028ea"
|
||||
|
||||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "911477d8da320db645db2b6b6180f1193ba7d36f"
|
||||
SRCREV = "c4988ca21346752e601df8a6b2cef3ee10c062f0"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "00556e09790b83b3a2a83020b900e07829eaa0a4"
|
||||
SRCREV = "d80d31a2d4bd94a4a97dd532a126f04d1a4dfc2d"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "0ae9f37f9771f0b6536b28202e46c21d5995f13e"
|
||||
SRCREV = "73259adb59f15dab266504f5444c99a6e06a7f32"
|
||||
|
||||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "2c9396b063ca03b36e03fbdb85853a410787313d"
|
||||
SRCREV = "b28b121f05caba25da9544b31059832e0a492eef"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "8943eb70b12603f5136e83d285c01b7d50dbb2cf"
|
||||
SRCREV = "77af92deffa9aeb8a5f85f1e73c3f110d24f7f40"
|
||||
|
||||
@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "dbc0d09be2bbc3dce01ace956f534c4012402fba"
|
||||
SRCREV_chromium = "7a779d0160771dcf6b4a644bc11137753c25982c"
|
||||
SRCREV_qtwebengine = "636b32c7f22c96e9562270219cedca52d5203737"
|
||||
SRCREV_chromium = "89644ad92fee38706430c1adb1e29b9756193b4f"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
@@ -18,4 +18,4 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "3581cde283545b907671d0cc42eeda6cbdeccb66"
|
||||
SRCREV = "560f3c6f9a5e199f88be2f111e1ee5fa19948d57"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "465c6c3914455e8ed20f938e5d4a35e6decb446c"
|
||||
SRCREV = "fd324911025d49b8b3d89a155ce38e3228edfd33"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "57f656a964aa9fdeb966d14eddc39f62a989b86b"
|
||||
SRCREV = "bc7e946f0e823be99de7834a2784c22d5ae2d628"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "35ae66f89959e1dd98648cc4033e153e1e5240b4"
|
||||
SRCREV = "547506f904a2ba72d56c2c61c2c24adea91bdd25"
|
||||
|
||||
@@ -25,7 +25,7 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28"
|
||||
SRCREV = "e74c6fee102c228da060f3899610e4449bc1851a"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user