Update to Qt 5.12.11

Signed-off-by: Dan Ackers <dan.ackers@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Dan Ackers
2021-05-04 16:37:19 +03:00
committed by Martin Jansa
parent f05c18abb4
commit 087dea07b6
40 changed files with 43 additions and 43 deletions

View File

@@ -195,4 +195,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 = "c919fc5f65c1c509370df7e616263ed007931a7a"
SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"

View File

@@ -36,6 +36,6 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
SRCREV = "c9d86b593e62c880d567a0672bd86283d8242f15"
SRCREV = "6704dfddcb6630809abc55b420dd125aa292922e"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -2,7 +2,7 @@
# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "5.12.10"
QT_MODULE_BRANCH ?= "5.12.11"
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.10+git${SRCPV}"
PV = "5.12.11+git${SRCPV}"

View File

@@ -144,4 +144,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 = "c919fc5f65c1c509370df7e616263ed007931a7a"
SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"

View File

@@ -296,4 +296,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "c919fc5f65c1c509370df7e616263ed007931a7a"
SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtdeclarative"
SRCREV = "b977d8c14cda8159dfd669e0bd42b263e936a12d"
SRCREV = "3c642062e896f3c6f300108ece203f89f68e578f"

View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "754f8d15a01bae966c43749e3cc833d2def7e808"
SRCREV = "d8d2057cbfcf190908a9780085726200bcfe5590"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/

View File

@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "568c411f2751a97e9cc39f58adfa16f2465c4bae"
SRCREV = "8618e25e01ca9c6c6b2221041f625ac69f6757b8"

View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "dae7527bee9f86bc0e6254068aeeb908df5a6de5"
SRCREV = "e2c93beb40914118861a329889c08ca04fb54577"

View File

@@ -24,7 +24,7 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "36e4e9bbd402cefab9d7b68635a94a02e0b41187"
SRCREV = "ca5d6cccde1f977eedb46f3320fe8384ea41758e"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "93b710ebc59a5fac6f9f657c5afe8770bf7506ab"
SRCREV = "dd95a7e0c6a8f00cc6f97f3db17eb7abcadef91a"

View File

@@ -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 = "fabaae2f8039d9f12e8531e2dc215b24ffe8d445"
SRCREV = "b2634e344d73154aea459031cf8fa298e668c4fa"

View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "7518d381be0f58f943bd8bead901356d2528e26b"
SRCREV = "25341cf53dfa36c83b74c125c260c72d2477ba5d"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "1e3510bf14942bd1b1134a52700e0ca06cbbf5d8"
SRCREV = "171677eca8e86680d66058d4d42dd2caad8142a3"

View File

@@ -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 = "3c7489c3802a11bf62b7f851fb088f9671b76262"
SRCREV_qtlocation = "1467a23cb25779d304e5bcdd6feb1b059c6609e6"
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "91d59b6e103cb5b910d310cb32938a7e9235dddb"
SRCREV = "5cb065944cbdbaa25d9236d7c990b2d683541374"

View File

@@ -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 = "67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e"
SRCREV = "a83b9873c0d2fe6001e3653e7ec8126c368dfd39"

View File

@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "2bcf17c3e4131b0b5b15c96ed104fceede3c3990"
SRCREV = "c8ee9188de609b4432e70a8b1edbc52d756c348d"

View File

@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "a718a44c796b8805fc208035cd743de1efd7e7d4"
SRCREV = "9e378827c597ed83a52b72545730bd77f97333c9"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "f3cbd4531566f6c0d0b14ba179b8396bf4270083"
SRCREV = "e6f9faf8b2e3b8973875913859962946874ce36f"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
SRCREV = "63f73a2aee40f9bec5ef63fdd416877a6737110d"
SRCREV = "249469f9ee1ca682e2d2b69da57e4408f6354290"

View File

@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
SRCREV = "8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c"
SRCREV = "8b9258bea9928718827f19e3f2de43ad2e06f863"

View File

@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "bfd4ed0f9a6edf9217dcea99e2f045f532453783"
SRCREV = "287260928b5ca3b8bc4137daeaf9cfd78763a08d"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -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 = "2ec32b5fdb9671f44e506964ae03109e557dfb99"
SRCREV = "1864a837cb69bd827222a8a7ab738b576f0fe1f2"

View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "878112bf670bb9f9caa09de290c63b0f9078d3f0"
SRCREV = "585b47f5a171a0c1052fae5b7a575d27893caafd"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
# 5.12.meta-qt5.2

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "903ed99bcc92417cd76d79ac598daf5f299b80cd"
SRCREV = "a24dc8e867bbf97078babec7b752ccaf6638cea3"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "dbddf24b08141ffd2f1ed98fbcf64b1220161e05"
SRCREV = "0a751b7ca63b96a2642dea4f2d012099a2f1aebf"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "9431549e2e3c75dafa38a6bd7d45cbaa091a632f"
SRCREV = "9f839731d9a2dfa7ca022afabda8a2071f55e174"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "261ed79b966065f4ce398f1a701be6298dd49be9"
SRCREV = "9311a42677db244cd1c584f27270fa73f69d90d7"

View File

@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
"
SRCREV = "1d665e7f4ac2a426e702c2935f11aa160e27bddb"
SRCREV = "cceb7710cf287ea88b72260093de985987d83f56"
BBCLASSEXTEND = "native nativesdk"

View File

@@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native"
do_install_append() {
# remove qtquick1 translations - qtquick1 is gone
for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do
for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
rm $transfile
done
}
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "e281294aeb5e74e93fb2f71233b133a4177593d6"
SRCREV = "161225fb99099f67ac4a2b41eb051c062e34a91d"

View File

@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
SRCREV = "bb9fd3b992d716ebba392bc3cf21da41e5562d08"
SRCREV = "ed820383941b68f1fe244895e73ee61ba87c4377"

View File

@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "971ed94adbf538af5a09e4136921fc0e8cee9815"
SRCREV = "8fe61d79d6d629958da7e590174a0e0600652bed"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "7219a32c30d21bc6cc8fe2121e28d19da3d67b00"
SRCREV = "ee94974592b1423b0438f809390a9237cdc8f1e4"

View File

@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "07fcac049e7b362b703f31ec559f5097f804588e"
SRCREV_chromium = "92253f4cc04b8fddd238e2fc9309d8c33c8bdc05"
SRCREV_qtwebengine = "9dfb4348feb612ea6405428c3c64f48328083e94"
SRCREV_chromium = "bda00397362bf03ff7b8d88fa54625524f604c7e"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"

View File

@@ -18,4 +18,4 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "954a898bea7af04cb619c05637a651e3a0d925f3"
SRCREV = "b3089f235788650eac329c552393a36b3f65f06a"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "4156135c236ae2799f40fae1741c038d1f150934"
SRCREV = "56c4699b432ad2ea9e1de9922ee97ac7c637f2fc"

View File

@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
COMPATIBLE_MACHINE_armv7ve = "(.*)"
COMPATIBLE_MACHINE_aarch64 = "(.*)"
SRCREV = "14a616da97106ce08fae58329c211c4688c7fbdf"
SRCREV = "fa3d166d96c958d62c5f02c1f6475ce1fb3f08b5"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "be7f01d16d143681be394a13e19eb4d816aa8a97"
SRCREV = "2f7e2243c613677efe386d8e1ca0699a4050b0d2"

View File

@@ -25,7 +25,7 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "2e532e96db74bc666af800c2530827eea75a2107"
SRCREV = "bac4d2eb31cc7d2df246fe069376dad0ed531dc8"
BBCLASSEXTEND =+ "native nativesdk"