mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-16 20:21:56 +02:00
qt5: upgrade to 5.15 beta3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -196,4 +196,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 = "f515ca5dcd02cc7490c3113bdff739aa2b2fd77f"
|
||||
SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "dd84bf4a99bb181fc1176830b4504d6f023898d8"
|
||||
SRCREV = "622c757a93624c660de9a33fc833a10de6a2efe6"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.14.99+5.15-beta2+git${SRCPV}"
|
||||
PV = "5.14.99+5.15-beta3+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 = "f515ca5dcd02cc7490c3113bdff739aa2b2fd77f"
|
||||
SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820"
|
||||
|
||||
@@ -294,4 +294,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "f515ca5dcd02cc7490c3113bdff739aa2b2fd77f"
|
||||
SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820"
|
||||
|
||||
@@ -35,7 +35,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 = "05659943df25a4ab6edcbfc8ebaa6bc23a2eb72f"
|
||||
SRCREV_qtlocation = "eda2a7c286058176e1906d0ddc88d4e2cfbec55e"
|
||||
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -38,4 +38,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 = "d0e0119251288c9c7224c5c6797a1377032aac2f"
|
||||
SRCREV = "7f0503acb042d047682b432e68ed97b1644c3f59"
|
||||
|
||||
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
|
||||
"
|
||||
|
||||
SRCREV_qtquick3d = "de18b72523a08068ae97bf8f244cab3b331218ae"
|
||||
SRCREV_qtquick3d = "ba49d22e9dce12f2a85b91d4876d8e1aee0792df"
|
||||
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
|
||||
|
||||
SRCREV_FORMAT = "qtquick3d_assimp"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "b30052fa41f6332f20ec440dcdbcd06b41a954f5"
|
||||
SRCREV = "ff3fd7b0330cb76772066ce7162320f4dc1a5c28"
|
||||
|
||||
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "128540391f27da4dce8b460883fbcdb3aba8a44c"
|
||||
SRCREV = "78e8a23e171569d231c3b8cd14fddef1e9b10a34"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "d2648237c7e3bfc03077b7b1e63c72dc24ff519c"
|
||||
SRCREV = "b3556c25ffdc64595e41d005b091776035134846"
|
||||
|
||||
@@ -145,7 +145,7 @@ RDEPENDS_${PN}-examples += " \
|
||||
QT_MODULE_BRANCH_CHROMIUM = "79-based"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
|
||||
# 5.15.meta-qt5.2
|
||||
# 5.15.meta-qt5.4
|
||||
SRC_URI += " \
|
||||
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
|
||||
file://0001-Force-host-toolchain-configuration.patch \
|
||||
@@ -189,7 +189,7 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac"
|
||||
SRCREV_qtwebengine = "6b62dfe7242ce0d3067aa98620664a4dc7a656d8"
|
||||
SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user