mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-04 05:04:36 +02:00
Upgrade to Qt 5.10.1
Updated Qt modules to 5.10.1. New recipe qtknx added. Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
5250890a9f
commit
e41caf42e9
@@ -210,4 +210,4 @@ fakeroot do_generate_qt_environment_file() {
|
||||
|
||||
addtask generate_qt_environment_file after do_install before do_package
|
||||
|
||||
SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
|
||||
SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e"
|
||||
|
||||
@@ -37,6 +37,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "7bd57d2218794fdd7bcaa4f2c8107ef60740ff75"
|
||||
SRCREV = "31f424bb81cd2583920d3d521e1e01f01c2d28e2"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.10.0+git${SRCPV}"
|
||||
PV = "5.10.1+git${SRCPV}"
|
||||
|
||||
@@ -136,4 +136,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 = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
|
||||
SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e"
|
||||
|
||||
@@ -240,4 +240,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
|
||||
|
||||
RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
|
||||
|
||||
SRCREV = "50117d738af526cbfbd5afa50b9a501acb0fb9ce"
|
||||
SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS = "qtdeclarative"
|
||||
|
||||
SRCREV = "8137223f6c489c2d1bb2317474c99c77245bd7ec"
|
||||
SRCREV = "0eecd96a7b83e8b1fc2811ec366b4ca1980296e0"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "6a9606270e6611c818bdab382a29051d4cd3b459"
|
||||
SRCREV = "9a4f99f518a49716cc9cc300eb456c6b13f9e8d1"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "bb9b8af08b1602c7c867969b236393b3ff3f7f18"
|
||||
SRCREV = "2331b915d207fe794a07b834ec2bf8578965bc4d"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "d2abb20082322167311cfe0c84afa822754b74ef"
|
||||
SRCREV = "397e50147407c16a16b6505558992ca3180f9aff"
|
||||
|
||||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "dac71f3d6f6bc4f159f6107c792bc70cfe7c308e"
|
||||
SRCREV = "3e91062877c0853aff693799bc5e33cdf7aaad42"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "b505116ee456d7084d8f570e062b3031b77d79df"
|
||||
SRCREV = "e6f366618dc9a3d232446197d6fea7c814e53828"
|
||||
|
||||
@@ -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 = "5ca1c00b33b0e125ab60413aa0fb3c7b0f89d8f2"
|
||||
SRCREV = "a38c4da7b598f5a185d7c9f824482d418353e6bf"
|
||||
|
||||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "caa90acd43684dc382f1e4f01c8787e18653ef43"
|
||||
SRCREV = "892d4a0df7dccc6e70586835bb1211cf1b79bc69"
|
||||
|
||||
12
recipes-qt/qt5/qtknx_git.bb
Normal file
12
recipes-qt/qt5/qtknx_git.bb
Normal file
@@ -0,0 +1,12 @@
|
||||
require qt5.inc
|
||||
require qt5-git.inc
|
||||
|
||||
LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
|
||||
@@ -1,14 +1,15 @@
|
||||
require qt5.inc
|
||||
require qt5-git.inc
|
||||
|
||||
LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial"
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
|
||||
@@ -29,7 +30,7 @@ SRC_URI += " \
|
||||
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
|
||||
"
|
||||
|
||||
SRCREV_qtlocation = "919bbf503d69fd6be87f22ea58c15872d08f8580"
|
||||
SRCREV_qtlocation-mapboxgl = "572822c8ca15be190b43afbf7f91d132e988bf21"
|
||||
SRCREV_qtlocation = "ec00ff89bee900a1b8925e227a892bc57839cd60"
|
||||
SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "45d87f0d9260ef0c42434daa329e77aecf3f5d46"
|
||||
SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
|
||||
|
||||
@@ -35,4 +35,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 = "3598915a360c596da48c9e7b00ba8469cba5249a"
|
||||
SRCREV = "038716bb1f2d9b95f2d638e2d61d297563343af9"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "febebfb6f09f23b16ac96a5a09d2ceb5b67046e7"
|
||||
SRCREV = "8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8"
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 2eed2f2c880e38e6c34aa246d210f18c75e085e5 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Thu, 31 Mar 2016 19:57:01 -0400
|
||||
Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
||||
---
|
||||
examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
|
||||
index 69da88f..9039191 100644
|
||||
--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
|
||||
+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
|
||||
@@ -54,6 +54,7 @@
|
||||
#include <QtGui/QTextCursor>
|
||||
#include <QtGui/QFontDatabase>
|
||||
#include <QtCore/QFileInfo>
|
||||
+#include <QtCore/QDebug>
|
||||
|
||||
DocumentHandler::DocumentHandler()
|
||||
: m_target(0)
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative"
|
||||
|
||||
SRCREV = "1265fef3b290665272d3aacd0ba5213c43bad89d"
|
||||
SRCREV = "e693ad2c4ae22f8813befd5fe825c855537497ed"
|
||||
|
||||
@@ -4,12 +4,9 @@ require qt5-git.inc
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
"
|
||||
|
||||
@@ -20,10 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.10
|
||||
# 5.10.meta-qt5.1
|
||||
SRC_URI += " \
|
||||
file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
|
||||
"
|
||||
|
||||
SRCREV = "a749525164b771452599e67e277d2ea6b3866479"
|
||||
SRCREV = "09ebb25aa686fc3f47f860905c2abb32a95c75d1"
|
||||
|
||||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "e6eb6ab12daf76f3e716c0d51ceecdab61e39e48"
|
||||
SRCREV = "61d2de26db7b90ad0ed3923b5deecd1c5b3be46a"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -4,11 +4,11 @@ require qt5-git.inc
|
||||
HOMEPAGE = "http://www.qt.io"
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
|
||||
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
# qemuarm build fails with:
|
||||
@@ -30,4 +30,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 = "0bb3f3017f72cbf8d6866b8baa1820ab3dd89316"
|
||||
SRCREV = "76bcf9b526f96edb35469e9de4b032a112a2b1c0"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "bbf3be4679571edef60425c3fd12df9d3035001c"
|
||||
SRCREV = "d9b2f8c56d162c108d5427769a8e496dd7a3b62e"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.10
|
||||
# 5.10.meta-qt5.1
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "7ae7dc325648a007a72e74f2bd7784a90b4714af"
|
||||
SRCREV = "d5a94c5595170fed9a0f7d3d42ef4b0216909d0d"
|
||||
|
||||
@@ -11,8 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtserialbus/commits/b5.10
|
||||
# 5.10.meta-qt5.1
|
||||
SRC_URI += "file://0001-Add-missing-include-for-struct-timeval.patch"
|
||||
|
||||
SRCREV = "f25ddea7b12beff8d4de863fec18ce698d726ffa"
|
||||
SRCREV = "d5d35d64d06729322c80327de40badaf553df87e"
|
||||
|
||||
@@ -3,16 +3,16 @@ require qt5-git.inc
|
||||
|
||||
# text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
|
||||
# other qt* components use :/
|
||||
LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial"
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
|
||||
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
|
||||
file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
|
||||
file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "c7d99464c65a5bde663a8ec4daf3d343d8e9b14b"
|
||||
SRCREV = "fa688ac5c36a16aa3b44d4ca1509f9386e670a89"
|
||||
|
||||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "984ba6977201f8fbd94d44a2b67519e1faf458cc"
|
||||
SRCREV = "af35137016f082c3fa15e61414f3c78c73ac322f"
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
require qt5.inc
|
||||
require qt5-git.inc
|
||||
|
||||
LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \
|
||||
file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative udev gconf"
|
||||
@@ -30,4 +31,4 @@ do_install_append() {
|
||||
|
||||
QT_MODULE_BRANCH = "dev"
|
||||
|
||||
SRCREV = "ca54870ffdf262f072c082adf80d63c421dbd68f"
|
||||
SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08"
|
||||
|
||||
@@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
|
||||
|
||||
SRCREV = "3ce89dc37d3c73033c18dcec9e4710afd747ce01"
|
||||
SRCREV = "03ebf1c3d6ceae715c696a171920a0204c58dd0a"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "f4b0f1684a8e668ede23fafbff02c3910d775043"
|
||||
SRCREV = "c3486e072ebc704f9c82c005044143b07bb88f12"
|
||||
|
||||
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
|
||||
|
||||
SRCREV = "8546475dd5d6076a98b0700f1d70211c1395fc63"
|
||||
SRCREV = "85d35bb12235dd6b92c898ddb6d6e84703d25d48"
|
||||
|
||||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "1a457a9dc9c61a6c995dbe06d72267cb0412b3bc"
|
||||
SRCREV = "db36bc0d9ccae21e84cd54be3e18ae539542eadc"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.10
|
||||
# 5.10.meta-qt5.1
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "acb01cb27b6c4aead84435ec7115fecd2a8db336"
|
||||
SRCREV = "7540a85c82cd940b7da3ea75eccad7e733bd0ae6"
|
||||
|
||||
@@ -159,8 +159,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "efa6d3f0d3a01753dd40823ce119e7d4f9765c8e"
|
||||
SRCREV_chromium = "e36dcec23b79a52fd7794ed2fad49bbf65a8146b"
|
||||
SRCREV_qtwebengine = "9dc8dff7a8f4d58f71d816375d49f8829f06aae5"
|
||||
SRCREV_chromium = "c858cc76099db0af82a264b3c6f921a287cfcb42"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "0e4b43383dd826b5927f6276033f52ede1fa7936"
|
||||
SRCREV = "2160c268ec80012f86be3eef20e05c267cdd2926"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "54ea23243ca84ec5f086abf6c2278a025758b6ce"
|
||||
SRCREV = "7445cd28616e68af3cf5e074a5576cbe6c5bf491"
|
||||
|
||||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "33e3fcc1fb1eb614f8b452296f2d4c4353c413c6"
|
||||
SRCREV = "a751298bc381b0fd0c6867e43d2613b98c2cb71f"
|
||||
|
||||
@@ -6,19 +6,15 @@ HOMEPAGE = "http://www.qt.io"
|
||||
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
|
||||
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
|
||||
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
|
||||
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "8b831bdb513b4f6b7567c171d09875b14214c5c4"
|
||||
SRCREV = "7c4113d6e6215b26b866ed2a0da0fa5e0c12b8ea"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user