diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:42:32 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | 3e7da25564d74195610adede9391ca733a0a1412 (patch) | |
tree | 6cc77f6d18df75d2c86191aea62e7336f24a1dbc /recipes-qt/qt5 | |
parent | cd0da4e4836cc1f35ad522b34ed254a83b270167 (diff) | |
download | meta-qt5-3e7da25564d74195610adede9391ca733a0a1412.tar.gz |
qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
42 files changed, 66 insertions, 142 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 96d3e055..da06514b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
14 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
15 | " | 14 | " |
16 | 15 | ||
17 | QT_MODULE = "qtbase" | 16 | QT_MODULE = "qtbase" |
@@ -39,7 +38,6 @@ SRC_URI += "\ | |||
39 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ | 38 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ |
40 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 39 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
41 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 40 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
42 | file://0014-Fix-qmake-build-with-glibc-2.28.patch \ | ||
43 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ | 41 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ |
44 | " | 42 | " |
45 | 43 | ||
@@ -194,4 +192,4 @@ fakeroot do_generate_qt_environment_file() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 192 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 193 | addtask generate_qt_environment_file after do_install before do_package |
196 | 194 | ||
197 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 195 | SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" |
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 88363219..b7885556 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 15ba3204df65645f604a23f71f819a392ff1e4b7 Mon Sep 17 00:00:00 2001 | 1 | From ef3babc66331a1d2bdb952380ac4f8fec30ea7b2 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
5 | 5 | ||
6 | --- | 6 | --- |
@@ -40,12 +40,13 @@ index 8ba2d9a41..e973d93dd 100644 | |||
40 | } else { | 40 | } else { |
41 | include(assimp.pri) | 41 | include(assimp.pri) |
42 | diff --git a/tools/tools.pro b/tools/tools.pro | 42 | diff --git a/tools/tools.pro b/tools/tools.pro |
43 | index 64f2b9fc7..d108e7fa7 100644 | 43 | index c2f692034..24c49ad5a 100644 |
44 | --- a/tools/tools.pro | 44 | --- a/tools/tools.pro |
45 | +++ b/tools/tools.pro | 45 | +++ b/tools/tools.pro |
46 | @@ -1,4 +1,4 @@ | 46 | @@ -1,5 +1,5 @@ |
47 | TEMPLATE = subdirs | 47 | TEMPLATE = subdirs |
48 | QT_FOR_CONFIG += 3dcore-private | 48 | QT_FOR_CONFIG += 3dcore-private |
49 | -qtConfig(assimp):qtConfig(commandlineparser): \ | 49 | -qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: { |
50 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ | 50 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { |
51 | SUBDIRS += qgltf | 51 | SUBDIRS += qgltf |
52 | } | ||
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index bd87dcb2..241601ba 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,6 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | SRCREV = "3b4a9b50618210c08dc08ae0e2dcf3b8d495eccf" | 39 | SRCREV = "d630e3c8a9ac291421f028873bd599f7a072dd65" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 09b6cc56..7128301c 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.11" | 5 | QT_MODULE_BRANCH ?= "5.11" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.11.1+git${SRCPV}" | 17 | PV = "5.11.2+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 03e7af2a..cf9d1bc3 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
14 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
15 | " | 14 | " |
16 | 15 | ||
17 | require qt5-native.inc | 16 | require qt5-native.inc |
@@ -34,7 +33,6 @@ SRC_URI += "\ | |||
34 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ | 33 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ |
35 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 34 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
36 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 35 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
37 | file://0014-Fix-qmake-build-with-glibc-2.28.patch \ | ||
38 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ | 36 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ |
39 | " | 37 | " |
40 | 38 | ||
@@ -137,4 +135,4 @@ do_install() { | |||
137 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
138 | } | 136 | } |
139 | 137 | ||
140 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 138 | SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" |
diff --git a/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch b/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch deleted file mode 100644 index 0cfd5428..00000000 --- a/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From 721d05fbe9e70518ed2288c089ff5d4036ea7ac7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thiago Macieira <thiago.macieira@intel.com> | ||
3 | Date: Tue, 7 Aug 2018 09:38:42 -0700 | ||
4 | Subject: [PATCH] Fix qmake build with glibc 2.28 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | We haven't yet run the configure checks to see if statx and renameat2 | ||
10 | are present in glibc, so this fails when we redefine the structures and | ||
11 | functions. | ||
12 | |||
13 | linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' | ||
14 | bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' | ||
15 | qfilesystemengine_unix.cpp:110:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] | ||
16 | |||
17 | Change-Id: Ia741b559c24d46c78fb2fffd1548a792d22e3368 | ||
18 | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> | ||
19 | Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> | ||
20 | --- | ||
21 | src/corelib/global/qconfig-bootstrapped.h | 12 ++++++++++-- | ||
22 | src/corelib/io/qfilesystemengine_unix.cpp | 2 +- | ||
23 | 2 files changed, 11 insertions(+), 3 deletions(-) | ||
24 | |||
25 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | ||
26 | index 3469ebe5e6..c5585ea32a 100644 | ||
27 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
28 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
29 | @@ -98,10 +98,18 @@ | ||
30 | #define QT_NO_QOBJECT | ||
31 | #define QT_FEATURE_process -1 | ||
32 | #define QT_FEATURE_regularexpression -1 | ||
33 | -#define QT_FEATURE_renameat2 -1 | ||
34 | +#ifdef __GLIBC_PREREQ | ||
35 | +# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
36 | +#else | ||
37 | +# define QT_FEATURE_renameat2 -1 | ||
38 | +#endif | ||
39 | #define QT_FEATURE_sharedmemory -1 | ||
40 | #define QT_FEATURE_slog2 -1 | ||
41 | -#define QT_FEATURE_statx -1 | ||
42 | +#ifdef __GLIBC_PREREQ | ||
43 | +# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | ||
44 | +#else | ||
45 | +# define QT_FEATURE_statx -1 | ||
46 | +#endif | ||
47 | #define QT_FEATURE_syslog -1 | ||
48 | #define QT_NO_SYSTEMLOCALE | ||
49 | #define QT_FEATURE_systemsemaphore -1 | ||
50 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | ||
51 | index be6ce48d0c..3e4f33a3ba 100644 | ||
52 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | ||
53 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | ||
54 | @@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); | ||
55 | # include <sys/syscall.h> | ||
56 | # include <sys/sendfile.h> | ||
57 | # include <linux/fs.h> | ||
58 | -# include <linux/stat.h> | ||
59 | |||
60 | // in case linux/fs.h is too old and doesn't define it: | ||
61 | #ifndef FICLONE | ||
62 | @@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp | ||
63 | # endif | ||
64 | |||
65 | # if !QT_CONFIG(statx) && defined(SYS_statx) | ||
66 | +# include <linux/stat.h> | ||
67 | static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) | ||
68 | { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } | ||
69 | # elif !QT_CONFIG(statx) && !defined(SYS_statx) | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 98664b09..2cf4af19 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
13 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 12 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
14 | " | 13 | " |
15 | 14 | ||
16 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
@@ -30,7 +29,6 @@ SRC_URI += "\ | |||
30 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ | 29 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ |
31 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 30 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
32 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 31 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
33 | file://0014-Fix-qmake-build-with-glibc-2.28.patch \ | ||
34 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ | 32 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ |
35 | " | 33 | " |
36 | 34 | ||
@@ -253,4 +251,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
253 | 251 | ||
254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 252 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
255 | 253 | ||
256 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 254 | SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 1f551f41..b6d89629 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -1,13 +1,14 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
4 | LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" | 4 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | 6 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
7 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | 7 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
8 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | 8 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
9 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | DEPENDS = "qtdeclarative" | 12 | DEPENDS = "qtdeclarative" |
12 | 13 | ||
13 | SRCREV = "cab02f1401ef10a06929c3681e45c57a02e15bec" | 14 | SRCREV = "f1a2bd81052802a2a762051066b724f1444df3ed" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d2061d20..2cf9067a 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "2ad3020dfee0af78bf4e3f90fd43b6d45679b468" | 11 | SRCREV = "29cfc9869349b83227452adc021273cde5857c91" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index c7f9dd8b..f7d2d2fe 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "c7f826f0c07c05948c3882242ce4d2ea0ced8a6f" | 22 | SRCREV = "8b70dcb210d82a55220c0a953653646a91d55251" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e58a50c0..d6b5d050 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "3b44cb4c0ae44deb6d5d941038fd9a2348aa8d01" | 11 | SRCREV = "2927c2509a2907be505a94600485d5e83c89431b" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e6173b4e..39095e59 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -33,6 +33,6 @@ do_install_append_class-nativesdk() { | |||
33 | 33 | ||
34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
35 | 35 | ||
36 | SRCREV = "68e282f510d5f5ee490ffdb0500f90e0932b8cef" | 36 | SRCREV = "0431e462dff57bc6a9010649c0d7f153d91cab2d" |
37 | 37 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 38 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index d8d2250e..380af675 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "4d393b920d984ec763c89e3fce7aab6d1af344fd" | 17 | SRCREV = "4bac917db87046017485a4758d4b9d8e6a50528b" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 2a34a245..fc2fa331 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "e954783bd9cdf490a7ffb2a9dc02f1031890d4ea" | 21 | SRCREV = "43d951c802f348c61ede03059c38bcb262e9e7f7" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 2d9c078d..d6614fb2 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 26 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "e945d172fef9ae8d3ce2d925c53316a3433ce034" | 29 | SRCREV = "529f5854c1bba36befba984b1a066d3b77689f12" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 70218296..ed821c01 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "e2faddd5d6b6ef468fed7ce129d849130c957da4" | 12 | SRCREV = "c378516c007f15f439dfb167bbe78a6b275667dc" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ff7cc574..075ea222 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += " \ | |||
31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "f8a0ae9109c2ee56a0480cbe62f07239afb31392" | 34 | SRCREV_qtlocation = "6d56b2295f377df4b7fc19543a496fa22b30c7d9" |
35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" | 35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 8aa26be8..e691e48d 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "b8a9a5aff7e924826c85029a9f919b5247752d5c" | 12 | SRCREV = "fd396f82b34f11afafc63f33a15e87b89fd1bd88" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 69ca00e7..03e8bc29 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "dfefe794b9d87fd04c9a529e1ca0aa1d18d44ddd" | 40 | SRCREV = "320a109d19a515eec370761c8ccb0a83d4e1de2f" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 1704ff55..dfaceab9 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "c4b57f78900fdb21a8dd99cf8045f5c678eb656c" | 12 | SRCREV = "d17cc152085f664c9e8a381d6be18af42c619108" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 2a788bec..20bf4e96 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | 12 | ||
13 | SRCREV = "f08a50d9d7b8ddec27fdd9f070fb7e54108570e4" | 13 | SRCREV = "e8561dd48762cbaf92bdb1b191ca8647415e19b1" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 1e2b2205..2c581b2d 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "1e9e0c388920af7e56fa9fb0fef81e23e9807062" | 13 | SRCREV = "cfeaf0be6c7869b15c87b83632be7eeebf76e0f9" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 31e1862c..c0305b35 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "5d482466d1cfa3292e01edacc429addbbd9fec29" | 13 | SRCREV = "4ba4b944686f3b2314dd26a56180d56c04d8b5bb" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 5d02ecd9..c333b9c8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "191a2fe59cbaf7603d502fa764b4737f49422010" | 20 | SRCREV = "6ffa877a646e694743173d381e8bd1d2c9d45d68" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b998922e..7d257c4f 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "cc454911ac5aec527379c2e51259583071d21ca9" | 27 | SRCREV = "fc13d3dbe5570d689f1bb84094a340096da721db" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index c430dc6e..7ae471c6 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -37,4 +37,4 @@ DEPENDS += "qtbase" | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "18c09cd0a3dd8143256fbe22b8e62aea346d17f1" | 40 | SRCREV = "b5f10e499754d57bde490f663a1edf63b4e1bcdc" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 503f9dbf..e4341873 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "de31ea0edc5ed6511bf635aa75f5d5c6f9aedc94" | 13 | SRCREV = "9cfd49dbb3b6a3a173dff4d83129bf96fdcea609" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 |
16 | # 5.11.meta-qt5.4 | 16 | # 5.11.meta-qt5.4 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index c8543ea5..383c9d95 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "b99d3da32b62e2a4c4d907928a5a73bc441db345" | 15 | SRCREV = "b4634741fd94dac837418fd5e4f6e1c75bb29a22" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 118de788..073dd45d 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -3,12 +3,12 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" | 4 | LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | 6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
7 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | 7 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ |
8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
9 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | 9 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ |
10 | " | 10 | " |
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "a59be66ab8b74f074f171b8fe4b75368483a8d4e" | 14 | SRCREV = "e9680f774fcd018842414734d1a6544ec366bf78" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 0ce23ca1..480e8b7f 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
4 | # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what | ||
5 | # other qt* components use :/ | ||
6 | 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 )" | 4 | 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 )" |
7 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
8 | file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ | 6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
@@ -14,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 12 | ||
15 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
16 | 14 | ||
17 | SRCREV = "1926ea36a923088e8765fb37f0c3a76fcfbc4994" | 15 | SRCREV = "d8a92d2ca965f5a9afccba0fb7b7f49d026820d4" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 63ed6e11..3da33beb 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "44ebf2803840555a60969fcca5f8f39eb3348939" | 16 | SRCREV = "6ddd60feae4f05ddf179f879b168656538ddb2ef" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 6e139cf2..4df07d3e 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "a01f3629377f25506d523406d2b93ffbff711a51" | 35 | SRCREV = "277af20762813ff92ea47a69b4d18563e01cc18e" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 7b434e73..08008a09 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -103,4 +103,4 @@ FILES_${PN}-qthelp = " \ | |||
103 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 103 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
104 | " | 104 | " |
105 | 105 | ||
106 | SRCREV = "3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d" | 106 | SRCREV = "60de15a0e0121096239cf6031250d2862e77971d" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index d3e2c353..1ce0a657 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
51 | 51 | ||
52 | SRCREV = "62dad13b1fb2fcf04c61700d3c477b998db2f63e" | 52 | SRCREV = "c8f5d466bcda37174a3f3d5acbf4db2eb9c29bb1" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 1643fc26..ec0406ca 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "3ffa7d5d6ecb75c244c6b22565df5184c638643a" | 40 | SRCREV = "0a6e1ddf708c47b3d19c1418630076e14021e49c" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 3fc1465f..efa84341 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "2ff27bf60e3bda8335adc557abd6486c144cb948" | 15 | SRCREV = "3994950f0d0065a4579b6bfe738702a6daeead96" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c8704384..23e22bde 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
173 | " | 173 | " |
174 | 174 | ||
175 | SRCREV_qtwebengine = "fe73e5405716531e85440772f69ad74943024eee" | 175 | SRCREV_qtwebengine = "6426f1e93622cb08a2286705398e7762cbcd0a45" |
176 | SRCREV_chromium = "bad02200c68d7e0c758dc4f1805e58d0e03fdea9" | 176 | SRCREV_chromium = "7085115f51ce9d02cfff216a3f74b1fb6715f38d" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 178 | ||
179 | SRCREV_FORMAT = "qtwebengine_chromium" | 179 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index c5605b4a..1df01552 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
@@ -18,4 +18,4 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
20 | 20 | ||
21 | SRCREV = "c40e4790835bd91a36bb19183d0799ff56555964" | 21 | SRCREV = "4f1c8aa8fcc60ca7eef5f92d4e920b065336ffd0" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index de058c5d..1134a63a 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "d99ae2d542515cf53faa5998c1a8e6b9204a6470" | 14 | SRCREV = "10ce467a825f2de5a5cb934c4ef21e76f8840a07" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 90917fb5..fc884911 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "8515dd6e203e596c7dbec5b950b3354a8012dd72" | 22 | SRCREV = "4c1918c99db5bcb3c95e777df2f6886f46b0336b" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index c53e0b21..082d3bf4 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -1,16 +1,15 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | require qt5-git.inc | 2 | require qt5-git.inc |
3 | 3 | ||
4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
10 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
12 | " | 11 | " |
13 | 12 | ||
14 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
15 | 14 | ||
16 | SRCREV = "a3570e9bab1abe5c80e00ddc10ae688c654c1427" | 15 | SRCREV = "131aa9037dd93595473bc7277123fbc3360ae15b" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d75e47d5..7b61d2c2 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
16 | 16 | ||
17 | SRCREV = "f6b06147b0065b1809c0a081fceec6f524dec2a4" | 17 | SRCREV = "bb3d518fea63cc834fe2b5654c3ac8bf7d2771f6" |
18 | 18 | ||
19 | BBCLASSEXTEND =+ "native nativesdk" | 19 | BBCLASSEXTEND =+ "native nativesdk" |
20 | 20 | ||