mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-04 05:04:36 +02:00
qt5: upgrade to 5.12.10
Signed-off-by: Lassi Lehikoinen <lassi.lehikoinen@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
6a9de2d841
commit
e49c07f5d6
@@ -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 = "823ed71e220ebde07970dd61c04bb47b01dd06c4"
|
||||
SRCREV = "c919fc5f65c1c509370df7e616263ed007931a7a"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "d77a1fbbce9a5723e355a961d04b11a1673de2ab"
|
||||
SRCREV = "c9d86b593e62c880d567a0672bd86283d8242f15"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
|
||||
|
||||
QT_MODULE ?= "${BPN}"
|
||||
QT_MODULE_BRANCH ?= "5.12"
|
||||
QT_MODULE_BRANCH ?= "5.12.10"
|
||||
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
|
||||
|
||||
# each module needs to define valid SRCREV
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.12.9+git${SRCPV}"
|
||||
PV = "5.12.10+git${SRCPV}"
|
||||
|
||||
@@ -143,4 +143,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 = "823ed71e220ebde07970dd61c04bb47b01dd06c4"
|
||||
SRCREV = "c919fc5f65c1c509370df7e616263ed007931a7a"
|
||||
|
||||
@@ -295,4 +295,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "823ed71e220ebde07970dd61c04bb47b01dd06c4"
|
||||
SRCREV = "c919fc5f65c1c509370df7e616263ed007931a7a"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS = "qtdeclarative"
|
||||
|
||||
SRCREV = "344511fe4af730aed9dd58af493b54cacf6f254e"
|
||||
SRCREV = "b977d8c14cda8159dfd669e0bd42b263e936a12d"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "3d92c71f44d4010b402469545fc581eabe23ad8c"
|
||||
SRCREV = "754f8d15a01bae966c43749e3cc833d2def7e808"
|
||||
|
||||
# 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 = "538cdb99e389fcc394260b4ac207df4aa2a28b60"
|
||||
SRCREV = "568c411f2751a97e9cc39f58adfa16f2465c4bae"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "5acf9421565d17083f1c7bbe08292989ee156659"
|
||||
SRCREV = "dae7527bee9f86bc0e6254068aeeb908df5a6de5"
|
||||
|
||||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "722caf22ad321166a6a212c74e96b5e7730c2553"
|
||||
SRCREV = "36e4e9bbd402cefab9d7b68635a94a02e0b41187"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "47ae6c32de7901a7075acb3d7ca97ae5e6be2a49"
|
||||
SRCREV = "93b710ebc59a5fac6f9f657c5afe8770bf7506ab"
|
||||
|
||||
@@ -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 = "8bfa0511fad910f7357b7fa5e47d2cc80f0dd24d"
|
||||
SRCREV = "fabaae2f8039d9f12e8531e2dc215b24ffe8d445"
|
||||
|
||||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "9dda3ab2147945fdd1226d658d5712aad680e61c"
|
||||
SRCREV = "7518d381be0f58f943bd8bead901356d2528e26b"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "df084d6cb69bacb9ae7e834f386e9b1720f0ef1b"
|
||||
SRCREV = "1e3510bf14942bd1b1134a52700e0ca06cbbf5d8"
|
||||
|
||||
@@ -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 = "f8d6d316aacf24943f8495d78862db5acc31ef57"
|
||||
SRCREV_qtlocation = "3c7489c3802a11bf62b7f851fb088f9671b76262"
|
||||
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "b8380847a935959f0aba26e791969457d91fab16"
|
||||
SRCREV = "91d59b6e103cb5b910d310cb32938a7e9235dddb"
|
||||
|
||||
@@ -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 = "45fb451024ef824333979e66d7381c23a0e02a7b"
|
||||
SRCREV = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "8015b204c6d6b1a705d2b71405ee6b77f092743f"
|
||||
SRCREV = "2bcf17c3e4131b0b5b15c96ed104fceede3c3990"
|
||||
|
||||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "2e1fe97bfd2ea359f9548ac1b984218fc6234652"
|
||||
SRCREV = "a718a44c796b8805fc208035cd743de1efd7e7d4"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "9b7dc6a2c2d07ba5f23259cf57089640ffe62ec6"
|
||||
SRCREV = "f3cbd4531566f6c0d0b14ba179b8396bf4270083"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "d112da7427513d497756add95e3ae6300f9ee66b"
|
||||
SRCREV = "63f73a2aee40f9bec5ef63fdd416877a6737110d"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "ce10dfef0d16f4b1cce222ab07e5ca339c009935"
|
||||
SRCREV = "8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c"
|
||||
|
||||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "b78d0b880af199715afaf684caf089420407eafc"
|
||||
SRCREV = "bfd4ed0f9a6edf9217dcea99e2f045f532453783"
|
||||
|
||||
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 = "47ad08af44be58b1eab6d985cb7368be121d27e9"
|
||||
SRCREV = "2ec32b5fdb9671f44e506964ae03109e557dfb99"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "eeab4442d4f20008acd04c8375523726d4e6d144"
|
||||
SRCREV = "878112bf670bb9f9caa09de290c63b0f9078d3f0"
|
||||
|
||||
# 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 = "e3d4c6654fa4c65d97d300c9ae1e9b76119c9bb7"
|
||||
SRCREV = "903ed99bcc92417cd76d79ac598daf5f299b80cd"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "326fd0669dbb68ab0fee31b75d2e0fd35ac9dda7"
|
||||
SRCREV = "dbddf24b08141ffd2f1ed98fbcf64b1220161e05"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "1e3a56904fe332756dee2dcabfc6ad09f62c9eee"
|
||||
SRCREV = "9431549e2e3c75dafa38a6bd7d45cbaa091a632f"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "6529b001dd0f542380806539210dd9168070a881"
|
||||
SRCREV = "261ed79b966065f4ce398f1a701be6298dd49be9"
|
||||
|
||||
@@ -32,13 +32,12 @@ EXTRA_QMAKEVARS_PRE += " \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "90aa88f31bba9521c1a6f0b242f97ebdc2285cee"
|
||||
SRCREV = "1d665e7f4ac2a426e702c2935f11aa160e27bddb"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
do_install_ptest() {
|
||||
mkdir -p ${D}${PTEST_PATH}
|
||||
t=${D}${PTEST_PATH}
|
||||
cp ${B}/tests/auto/qtdiag/tst_tdiag $t
|
||||
cp ${B}/tests/auto/qtattributionsscanner/tst_qtattributionsscanner $t
|
||||
}
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "b2ceff197a00ccda81beee9db0ee85dbf8a14f41"
|
||||
SRCREV = "e281294aeb5e74e93fb2f71233b133a4177593d6"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "19abb4ba2e721d893dc44c831ed3b4648ea58d47"
|
||||
SRCREV = "bb9fd3b992d716ebba392bc3cf21da41e5562d08"
|
||||
|
||||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "5ca98f0c3f66166f4c66486a276386137570556d"
|
||||
SRCREV = "971ed94adbf538af5a09e4136921fc0e8cee9815"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "23fd5f70c9ac2843d67a0d3e105425776e767a35"
|
||||
SRCREV = "7219a32c30d21bc6cc8fe2121e28d19da3d67b00"
|
||||
|
||||
@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "a5017ad1987d3368c1cbccb5085475055c3b74a5"
|
||||
SRCREV_chromium = "8a53e97dba1ec531727914b0189db93d21f977b8"
|
||||
SRCREV_qtwebengine = "07fcac049e7b362b703f31ec559f5097f804588e"
|
||||
SRCREV_chromium = "92253f4cc04b8fddd238e2fc9309d8c33c8bdc05"
|
||||
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 = "cdc501d2f1d96b226a424a296ff877ec3bbbf5e1"
|
||||
SRCREV = "954a898bea7af04cb619c05637a651e3a0d925f3"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "5fa19ba8a00a809c87202f82021221cfb7386e49"
|
||||
SRCREV = "4156135c236ae2799f40fae1741c038d1f150934"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "563c1a80e865e351473e63ec0b7921c200528e5d"
|
||||
SRCREV = "14a616da97106ce08fae58329c211c4688c7fbdf"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "6979e50d293c39c99fef1c439708d05db4802e93"
|
||||
SRCREV = "be7f01d16d143681be394a13e19eb4d816aa8a97"
|
||||
|
||||
@@ -25,7 +25,7 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "712fa2a8b2108503081eaea8e26bb68b199adaa5"
|
||||
SRCREV = "2e532e96db74bc666af800c2530827eea75a2107"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user