qt5: upgrade to Qt 5.12.7

* Update modules to Qt 5.12.7
* Update license agreement to v4.2.1

Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Mikko Gronoff
2020-01-16 10:48:15 +02:00
committed by Martin Jansa
parent 20331bd6b6
commit b35fcbfb8b
41 changed files with 969 additions and 551 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
"
QT_MODULE = "qtbase"
@@ -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 = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
SRCREV = "1bf5d3af1a4ec307bb77e1b54bb1f723c3eef481"

View File

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

View File

@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"
PV = "5.12.6+git${SRCPV}"
PV = "5.12.7+git${SRCPV}"

View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
"
require qt5-native.inc
@@ -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 = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
SRCREV = "1bf5d3af1a4ec307bb77e1b54bb1f723c3eef481"

View File

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
"
# common for qtbase-native, qtbase-nativesdk and qtbase
@@ -294,4 +294,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "f0b93f7a4b4281c5470280eb36b7c0ef5948a921"
SRCREV = "1bf5d3af1a4ec307bb77e1b54bb1f723c3eef481"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtdeclarative"
SRCREV = "51e8dc59d87463f32dab0e401e9ae17615c7b790"
SRCREV = "41142426b6d2dd16cf622349238697a457767b06"

View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "969fc5bf94e8e0e6cd86c79c38e11074de235273"
SRCREV = "3cfdc511efc4946fa585f2f1b67b6b651375cfbc"
# 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 = "33f5988eadf1b748d75deec8bc12afc1d47ea52f"
SRCREV = "bdedcf46183552cce796d9aa5149cac6826c49e6"

View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "2b753d7caa9f780d6a76829db516e3fb859c3353"
SRCREV = "633c128754dd586370d2b5e168b85eb7726c8203"

View File

@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "179c4b689d1a7b9e9edb71ddf545dc237bca6704"
SRCREV = "d762ea24b56d03d449c330626ff9b76f7663ad8d"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "39b7df80c9b58dffc7a6e9e68b99e1b9f78ed2e0"
SRCREV = "cae992e59d40f5f73272dbc7c393bb6a8caf82a9"

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 = "7ce8cd84f7f8ce8d0377019f7087b2352b5626e7"
SRCREV = "f24a7b83c98661ecd7ba44c3fbc9aa06f6aac265"

View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "dad286f15b75f36f37d4523ac86696e5133e58cb"
SRCREV = "584bff1ba46c8049f12d56090c3203c0e26b8987"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "c8786b87a1d9cbe2d6ee4234064beba93803d18d"
SRCREV = "9fc175a9771b1e54a5894795cdafee8e3ccda8d0"

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 = "ad359c55d36f39c7f243bee8960d490772bfe84e"
SRCREV_qtlocation = "f47d351a2b85159ba2986dc45d2474b840306946"
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "b70017b66d5a3d8daeaa7ab2a91c910f0535ffa3"
SRCREV = "f1892164ddeaf67062cc9a53f727fb7565a16cc5"

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 = "53a507b30befc40a4d06a1620e85bb4a5b1bf40a"
SRCREV = "19f4e7ff9d8276e0aa30806de1072a63472e5827"

View File

@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "ecdeaac31d2cdebda5d7b06a0224fd34649a7375"
SRCREV = "3681e2cd6c859e9028d9c6ae66cde77f56b2e972"

View File

@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "0e608b65ac435ce9d816543d5c8346059a650d55"
SRCREV = "bae44d81b02c0c1ecc5ae560753ccc9c7a0972c8"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "ceb003e074cdbb6f2429dd3f4ddcf995382d199e"
SRCREV = "dbe5a5ceb2232d6409e1e985c0f7816426655cba"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
SRCREV = "ed92154c712b0e54caa5baa72d832d7f8286307f"
SRCREV = "54bc815660b5b9789ae88f64de060add4b99b5ca"

View File

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

View File

@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "76d6a13889514b03a1878e19b56eb1e6f17d1b90"
SRCREV = "11ea1541265e3c151b83e608d7d4966cce8118db"
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 = "c2e02e863c3867f5d038731f429cc3a03f3cc3bc"
SRCREV = "a7d80e756397b24b20eccc4f254219914d21f30c"

View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "9ed16e4621ae705947d5e04ade450f1859ef86c5"
SRCREV = "2aa8d6b2544a09980dbf4d00c16a8b0cae130f97"
# 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 = "8fd13b71e50d0935af69e70f1961ac8194cb6fb3"
SRCREV = "9f61100a5702b47e2ae421da243959d87f476f12"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "4347caecbd0b2d02074a033eabf7d114ad7ca5f6"
SRCREV = "723990439e80d77b6a19c496d8811e8059d6bbef"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "f3bf6e0cc9c7b8c9d1ef249cf8043c465d7e8186"
SRCREV = "eb1c0764effce86ee0a7c290600be395a369d960"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "f8eb5228da5805161701477682489baf9d5028ea"
SRCREV = "a3e50a83ab5c4804ac1b1900420fdac70e7ffbd0"

View File

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

View File

@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "d80d31a2d4bd94a4a97dd532a126f04d1a4dfc2d"
SRCREV = "cb20da70ada2ffb92a08a232ddad5b1b51ade033"

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 = "73259adb59f15dab266504f5444c99a6e06a7f32"
SRCREV = "d96dde15be0fccf92d8c145205b30b67c3ec3221"

View File

@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "b28b121f05caba25da9544b31059832e0a492eef"
SRCREV = "32a5e01adf346ed317bfc6d5c7f7e994099f2448"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "77af92deffa9aeb8a5f85f1e73c3f110d24f7f40"
SRCREV = "6e6c22c6b361ebb675e3594362b9a1edcbdb83ae"

View File

@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "636b32c7f22c96e9562270219cedca52d5203737"
SRCREV_chromium = "89644ad92fee38706430c1adb1e29b9756193b4f"
SRCREV_qtwebengine = "41cef6e19364d785bd77c42e45ef7ca32e601410"
SRCREV_chromium = "5ca6ac0f951adec1f816b42f1c862d699e56a645"
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 = "560f3c6f9a5e199f88be2f111e1ee5fa19948d57"
SRCREV = "181201db91595a9a79b742a873360be3e3dd6f8b"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "fd324911025d49b8b3d89a155ce38e3228edfd33"
SRCREV = "c071c4528e48ceee72aeb00ab533e4db383502a0"

View File

@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
COMPATIBLE_MACHINE_armv7ve = "(.*)"
COMPATIBLE_MACHINE_aarch64 = "(.*)"
SRCREV = "bc7e946f0e823be99de7834a2784c22d5ae2d628"
SRCREV = "f2646867e21c95e4f648663f390828aeec898091"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "547506f904a2ba72d56c2c61c2c24adea91bdd25"
SRCREV = "5dada3edf48e5ea23541af75cc4d665787f7f188"

View File

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