diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 12:34:34 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-08 20:02:16 +0000 |
commit | c379ee9cbf11830f8a72cfed175226d0eea0c8c8 (patch) | |
tree | b8cf269496fb2940d088d6073518f767623a6c85 | |
parent | 1b2862e896e31c89459f3186b7e9fdbd64d72bdd (diff) | |
download | meta-qt5-c379ee9cbf11830f8a72cfed175226d0eea0c8c8.tar.gz |
qt5: update to Qt 5.12.5
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
43 files changed, 78 insertions, 107 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 3c4f31cc..1c897116 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
196 | 196 | ||
197 | SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" | 197 | SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" |
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 b1e662bc..64716c26 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,26 +1,24 @@ | |||
1 | From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 | 1 | From 60c8e6bd8ff8f5e4b7a986bfa35bb5d6c08626c0 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 | 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 | --- |
7 | qt3d.pro | 9 +++++++-- | 7 | qt3d.pro | 7 ++++++- |
8 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- | 8 | src/3rdparty/assimp/assimp_dependency.pri | 2 +- |
9 | tools/tools.pro | 2 +- | 9 | tools/tools.pro | 4 ++-- |
10 | 3 files changed, 9 insertions(+), 4 deletions(-) | 10 | 3 files changed, 9 insertions(+), 4 deletions(-) |
11 | 11 | ||
12 | diff --git a/qt3d.pro b/qt3d.pro | 12 | diff --git a/qt3d.pro b/qt3d.pro |
13 | index 847507f17..286286dd0 100644 | 13 | index d5dbda4..6809470 100644 |
14 | --- a/qt3d.pro | 14 | --- a/qt3d.pro |
15 | +++ b/qt3d.pro | 15 | +++ b/qt3d.pro |
16 | @@ -1,5 +1,5 @@ | 16 | @@ -1,4 +1,4 @@ |
17 | -requires(qtHaveModule(gui)) | 17 | -qtHaveModule(gui): \ |
18 | -requires(qtConfig(opengl):!wasm) | 18 | +!tools-only:qtHaveModule(gui): \ |
19 | +!tools-only:requires(qtHaveModule(gui)) | 19 | requires(qtConfig(opengl):!wasm) |
20 | +!tools-only:requires(qtConfig(opengl):!wasm) | ||
21 | 20 | ||
22 | CONFIG += examples_need_tools | 21 | CONFIG += examples_need_tools |
23 | load(qt_parts) | ||
24 | @@ -15,3 +15,8 @@ load(qt_parts) | 22 | @@ -15,3 +15,8 @@ load(qt_parts) |
25 | 23 | ||
26 | OTHER_FILES += \ | 24 | OTHER_FILES += \ |
@@ -31,7 +29,7 @@ index 847507f17..286286dd0 100644 | |||
31 | + SUBDIRS = sub_tools | 29 | + SUBDIRS = sub_tools |
32 | +} | 30 | +} |
33 | diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri | 31 | diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri |
34 | index 8ba2d9a41..e973d93dd 100644 | 32 | index 8ba2d9a..e973d93 100644 |
35 | --- a/src/3rdparty/assimp/assimp_dependency.pri | 33 | --- a/src/3rdparty/assimp/assimp_dependency.pri |
36 | +++ b/src/3rdparty/assimp/assimp_dependency.pri | 34 | +++ b/src/3rdparty/assimp/assimp_dependency.pri |
37 | @@ -1,5 +1,5 @@ | 35 | @@ -1,5 +1,5 @@ |
@@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644 | |||
42 | } else { | 40 | } else { |
43 | include(assimp.pri) | 41 | include(assimp.pri) |
44 | diff --git a/tools/tools.pro b/tools/tools.pro | 42 | diff --git a/tools/tools.pro b/tools/tools.pro |
45 | index 121507613..24c49ad5a 100644 | 43 | index 3b457ed..9f5376a 100644 |
46 | --- a/tools/tools.pro | 44 | --- a/tools/tools.pro |
47 | +++ b/tools/tools.pro | 45 | +++ b/tools/tools.pro |
48 | @@ -1,5 +1,5 @@ | 46 | @@ -1,9 +1,9 @@ |
49 | TEMPLATE = subdirs | 47 | TEMPLATE = subdirs |
48 | |||
49 | -!qtHaveModule(3dcore): \ | ||
50 | +!tools-only:!qtHaveModule(3dcore): \ | ||
51 | return() | ||
52 | |||
50 | QT_FOR_CONFIG += 3dcore-private | 53 | QT_FOR_CONFIG += 3dcore-private |
51 | -qtConfig(assimp):qtConfig(commandlineparser): { | 54 | -qtConfig(assimp):qtConfig(commandlineparser): { |
52 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { | 55 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index bcc63058..8be92d43 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 = "7da5c4c35a657ea43663b4ed0d65e896b8db5c69" | 39 | SRCREV = "bbe0805bfddcb61f7c07a6454793e76f142a32bc" |
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 1866f3e5..79a1e450 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.12.3+git${SRCPV}" | 17 | PV = "5.12.5+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 715fe6b5..19763f24 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -142,4 +142,4 @@ do_install() { | |||
142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 142 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
143 | } | 143 | } |
144 | 144 | ||
145 | SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" | 145 | SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" |
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 4d90c772..f8a438e9 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 | 1 | From f11e7738f9cb6c3f8e3eb60e55cb1145d2c2e2f4 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | |||
21 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 21 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
22 | --- | 22 | --- |
23 | configure | 2 +- | 23 | configure | 2 +- |
24 | mkspecs/features/configure.prf | 4 +-- | 24 | mkspecs/features/configure.prf | 4 ++-- |
25 | mkspecs/features/qt.prf | 6 ++--- | 25 | mkspecs/features/qt.prf | 6 +++--- |
26 | mkspecs/features/qt_functions.prf | 2 +- | 26 | mkspecs/features/qt_functions.prf | 2 +- |
27 | mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ | 27 | mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ |
28 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + | 28 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + |
29 | 6 files changed, 47 insertions(+), 7 deletions(-) | 29 | 6 files changed, 47 insertions(+), 7 deletions(-) |
30 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 30 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
31 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 31 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
32 | 32 | ||
33 | diff --git a/configure b/configure | 33 | diff --git a/configure b/configure |
34 | index ef7bad1bfc..dcca0f9135 100755 | 34 | index ef7bad1..dcca0f9 100755 |
35 | --- a/configure | 35 | --- a/configure |
36 | +++ b/configure | 36 | +++ b/configure |
37 | @@ -712,7 +712,7 @@ fi | 37 | @@ -712,7 +712,7 @@ fi |
@@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 | |||
44 | 44 | ||
45 | # build qmake | 45 | # build qmake |
46 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 46 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
47 | index 934a18a924..0f5b1b6333 100644 | 47 | index 934a18a..0f5b1b6 100644 |
48 | --- a/mkspecs/features/configure.prf | 48 | --- a/mkspecs/features/configure.prf |
49 | +++ b/mkspecs/features/configure.prf | 49 | +++ b/mkspecs/features/configure.prf |
50 | @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { | 50 | @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { |
@@ -65,19 +65,19 @@ index 934a18a924..0f5b1b6333 100644 | |||
65 | msg = "test $$1 succeeded" | 65 | msg = "test $$1 succeeded" |
66 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 66 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
68 | index d8d5acaafd..57d11420c2 100644 | 68 | index 89f4946..97c1b43 100644 |
69 | --- a/mkspecs/features/qt.prf | 69 | --- a/mkspecs/features/qt.prf |
70 | +++ b/mkspecs/features/qt.prf | 70 | +++ b/mkspecs/features/qt.prf |
71 | @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { | 71 | @@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { |
72 | !isEmpty(plug_type) { | 72 | plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB |
73 | plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) | 73 | plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) |
74 | isEmpty(plug_path): \ | 74 | isEmpty(plug_path): \ |
75 | - plug_path = $$[QT_INSTALL_PLUGINS/get] | 75 | - plug_path = $$[QT_INSTALL_PLUGINS/get] |
76 | + plug_path = $$[QT_INSTALL_PLUGINS] | 76 | + plug_path = $$[QT_INSTALL_PLUGINS] |
77 | LIBS += -L$$plug_path/$$plug_type | 77 | LIBS += $$plug_path/$$plug_type/$$plug_name |
78 | } | 78 | } else { |
79 | LIBS += -l$${plug}$$qtPlatformTargetSuffix() | 79 | LIBS += -l$${plug}$$qtPlatformTargetSuffix() |
80 | @@ -277,8 +277,8 @@ for(ever) { | 80 | @@ -271,8 +271,8 @@ for(ever) { |
81 | # static builds: link qml import plugins into the target. | 81 | # static builds: link qml import plugins into the target. |
82 | contains(all_qt_module_deps, qml): \ | 82 | contains(all_qt_module_deps, qml): \ |
83 | qtConfig(static):import_plugins:!host_build:!no_import_scan { | 83 | qtConfig(static):import_plugins:!host_build:!no_import_scan { |
@@ -89,7 +89,7 @@ index d8d5acaafd..57d11420c2 100644 | |||
89 | # run qmlimportscanner | 89 | # run qmlimportscanner |
90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) | 90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) |
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 1903e509c8..c093dd4592 100644 | 92 | index 1903e50..c093dd4 100644 |
93 | --- a/mkspecs/features/qt_functions.prf | 93 | --- a/mkspecs/features/qt_functions.prf |
94 | +++ b/mkspecs/features/qt_functions.prf | 94 | +++ b/mkspecs/features/qt_functions.prf |
95 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { | 95 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { |
@@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 | |||
103 | cmd = perl -w $$system_path($${cmd}.pl) | 103 | cmd = perl -w $$system_path($${cmd}.pl) |
104 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 104 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
105 | new file mode 100644 | 105 | new file mode 100644 |
106 | index 0000000000..c202c47fa1 | 106 | index 0000000..c202c47 |
107 | --- /dev/null | 107 | --- /dev/null |
108 | +++ b/mkspecs/linux-oe-g++/qmake.conf | 108 | +++ b/mkspecs/linux-oe-g++/qmake.conf |
109 | @@ -0,0 +1,39 @@ | 109 | @@ -0,0 +1,39 @@ |
@@ -148,7 +148,7 @@ index 0000000000..c202c47fa1 | |||
148 | +load(qt_config) | 148 | +load(qt_config) |
149 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h | 149 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h |
150 | new file mode 100644 | 150 | new file mode 100644 |
151 | index 0000000000..5d22fb4101 | 151 | index 0000000..5d22fb4 |
152 | --- /dev/null | 152 | --- /dev/null |
153 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h | 153 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h |
154 | @@ -0,0 +1 @@ | 154 | @@ -0,0 +1 @@ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c1f6cfba..e71038de 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -294,4 +294,4 @@ sed -i \ | |||
294 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 294 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
295 | } | 295 | } |
296 | 296 | ||
297 | SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" | 297 | SRCREV = "abfb1b8665923ce2824392f3a04e5e4ac3871017" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index de5655d3..d1a6c9f0 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS = "qtdeclarative" | 12 | DEPENDS = "qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "e722ccfe62f2745b2da3b8b1202f8d224c3e5a5f" | 14 | SRCREV = "ae8749c175b64222190cdebc6d0b2eceddc0bfc8" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index bde9f40e..988c8fb0 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 = "dcc4fd4fe0aff770204272d04749184df133bbb2" | 11 | SRCREV = "dd65e383b2f900b8e661b678c746cd71fdef697e" |
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 414ce334..1973e26c 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
21 | 21 | ||
22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
23 | 23 | ||
24 | SRCREV = "9a77336d4984875d95f48b20a521c34f742e0fa7" | 24 | SRCREV = "0a5bf7a41e5c2c4a36efeace83444ceaee79c945" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e9252f33..6a0792bb 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 = "4672b6d2c725a74d482a76d6624671ae3a2ba2a1" | 11 | SRCREV = "3858190b2b2e71a7b63e9976da2b22f1c342e3b3" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 41481b4c..f3911174 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
25 | } | 25 | } |
26 | 26 | ||
27 | SRCREV = "95c938cd67a1f9ccaf5a3a5fd40993f619786ca9" | 27 | SRCREV = "7b47350736f46c59d81238d3d6284358a652983b" |
28 | 28 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 2a142ece..c4ff0a0d 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 = "48eeb8adf8ccf9eef284b7c6406708bf724f3652" | 17 | SRCREV = "09de115d0d31fbc62d16aef821f96b487dbf5169" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 8ba59471..3ca0f104 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 = "9c70295220c6dc7f8b4ba8d8406084129e317a6f" | 21 | SRCREV = "06116f294697e052edc31ac35dc58f46bf493913" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 75442663..90bc94ed 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "5e433bcefaebb8dac20edb96170349f9a0adde5d" | 28 | SRCREV = "53f8fd57b698b97aded363700306fe61c4b9ea17" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index ead1b19b..cd598af4 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 = "0dfc76b080df56ef1638bd6a9deb7325692bc242" | 12 | SRCREV = "ee2f01020005b1baa63de918be1dc75ae581f7b1" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6b09db4c..30a9d127 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -36,7 +36,7 @@ SRC_URI += " \ | |||
36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 36 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV_qtlocation = "cbcff2b083df51fb96f38cd64446f4e5afb3b2d1" | 39 | SRCREV_qtlocation = "1de7ca6175bd3e4a542a038a089cfd73c9eaa27a" |
40 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 40 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
41 | 41 | ||
42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 42 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index d83ce919..fa7b28a4 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 = "6281dd7e375f94a5e7f78055c0bebba93a2b0e02" | 12 | SRCREV = "b4b171877ece7da3dab869fb40019d493560097c" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 30f9c9e4..be08ff3e 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 = "64981aee3bbbe2c4f5503b458636a84df822b0ec" | 40 | SRCREV = "0b77a2d9852d3aa8c8c21a68be8a1d6805197155" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 849feeb9..6aa93567 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 = "5c9251aebb487a6c328f2d706002ca2039aff5ac" | 12 | SRCREV = "773a0dc64c73c1584fd1ed8fe081a9d9b1b1e4d5" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index a86abbca..ad442ad9 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -1,18 +1,21 @@ | |||
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 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" | 4 | LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ | 6 | file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ |
7 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 7 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ |
8 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ | 8 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | PACKAGECONFIG ?= "qtdeclarative" | ||
12 | PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | ||
13 | |||
11 | # src/3rdparty/open62541.pri adds -Wno-format, causing following error | 14 | # src/3rdparty/open62541.pri adds -Wno-format, causing following error |
12 | # because -Wformat-security cannot be used together with -Wno-format | 15 | # because -Wformat-security cannot be used together with -Wno-format |
13 | # cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] | 16 | # cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] |
14 | SECURITY_STRINGFORMAT = "" | 17 | SECURITY_STRINGFORMAT = "" |
15 | 18 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 19 | DEPENDS += "qtbase" |
17 | 20 | ||
18 | SRCREV = "56d2b5df55c9a6ea7d21f3412193903f2504249e" | 21 | SRCREV = "3f51fb011ccb5cc3697f23477ecb7b65b75f5a1a" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 0750fe68..2e94ebf9 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 = "aa924c0575c54c93a5b95ace4083c34f309a16d0" | 13 | SRCREV = "acdb9438f7ae94b29bab9c261ec20e18ec80390d" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index d41c4b3a..2be66ddc 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 = "f7ba074ca19f5f3d2d7580616144c65f35b48072" | 13 | SRCREV = "6a3356dfd8a98131d2912d16c666419d5eeaa10e" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d7d9170f..be706c79 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 = "3a5ac4885b4818489120e9b46c208737ad202fb6" | 20 | SRCREV = "b37db1f31b3248e9d32d0ccbb42e77035fa5b340" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d4fd74cc..3439e717 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 = "db1e447c46062946e57d7de9c0e0ea5fddc997f6" | 27 | SRCREV = "c76dfdc3eafe1d2129761951c3ca6970699badfb" |
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 cebd863d..5878ad59 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "2f6a1056f10dbe634c58725ad2893c6cee58bf1c" | 39 | SRCREV = "1701681e4f8ee3b17ca39f563a24065ee43b3a52" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index e71d2828..c07e7469 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 = "755c5a753d77f4c8f53788c870240e60673417a0" | 13 | SRCREV = "f416efc6e2ea2fff4357cd87f4458e009ac5d595" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
16 | # 5.12.meta-qt5.2 | 16 | # 5.12.meta-qt5.2 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 41c31283..65783ac6 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 = "b1cb2782b369413add8aeb4c4e6c1453bbf5e367" | 15 | SRCREV = "b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42" |
diff --git a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch deleted file mode 100644 index c42af774..00000000 --- a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From b835affb7851f9b8bc2554f0a38e4b539505a132 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre Hartmann <aha_1980@gmx.de> | ||
3 | Date: Mon, 8 Jul 2019 21:35:12 +0200 | ||
4 | Subject: [PATCH] =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"?= | ||
5 | =?UTF-8?q?=E2=80=98SIOCGSTAMP=E2=80=99=20was=20not=20declared"?= | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Fixes: QTBUG-76957 | ||
11 | Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b | ||
12 | Reviewed-by: Alex Blasche <alexander.blasche@qt.io> | ||
13 | Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Backport [https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482] | ||
16 | src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
20 | index 74b0d1d..a2da146 100644 | ||
21 | --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
22 | +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
23 | @@ -45,6 +45,7 @@ | ||
24 | |||
25 | #include <linux/can/error.h> | ||
26 | #include <linux/can/raw.h> | ||
27 | +#include <linux/sockios.h> | ||
28 | #include <errno.h> | ||
29 | #include <unistd.h> | ||
30 | #include <net/if.h> | ||
31 | -- | ||
32 | 2.23.0 | ||
33 | |||
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d1b294a1..9b9091eb 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,6 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRC_URI += "file://0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch" | 14 | SRCREV = "c8645af35accdfadfa2b29cd897f77b6e15704c8" |
15 | |||
16 | SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" | ||
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1dad6ad1..bfcab3a6 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "6fad8e67d879b1979c48ee615a972571a6426718" | 15 | SRCREV = "b1413c11b999aadca302c1b12dd90a12b55a1f12" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index c167f0a7..4c5ea0b5 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "a4c2e4de3c8c248a340bef815105371f365a456a" | 15 | SRCREV = "cd2d1245b8237aba4f64d8336b39e2635665564f" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d2b905b6..8ff05a4c 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 = "1f8d498752fed0b2b92d6a619aa11524dd771998" | 35 | SRCREV = "911477d8da320db645db2b6b6180f1193ba7d36f" |
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 88948a56..dbbef411 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ | |||
98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
99 | " | 99 | " |
100 | 100 | ||
101 | SRCREV = "8cd09ac290c75eeeb91c015e7d7791b15c0cac5e" | 101 | SRCREV = "00556e09790b83b3a2a83020b900e07829eaa0a4" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 8fcf4b58..c1dbca27 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
71 | 71 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "c7f9640cb883c05e1ba51dac69078782b7eff855" | 74 | SRCREV = "0ae9f37f9771f0b6536b28202e46c21d5995f13e" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 58ffbe78..7131d1e3 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "bcdc00bcdc67ee478369c04c994c1f576e51cfab" | 40 | SRCREV = "2c9396b063ca03b36e03fbdb85853a410787313d" |
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 cc3c867a..a53c1883 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 = "5bcd09ac1b670658c77b7712873c75893e4a41a4" | 15 | SRCREV = "8943eb70b12603f5136e83d285c01b7d50dbb2cf" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e4e19a4b..8f0b23be 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -176,8 +176,8 @@ SRC_URI_append_libc-musl = "\ | |||
176 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
177 | " | 177 | " |
178 | 178 | ||
179 | SRCREV_qtwebengine = "c7b8d6d87809253241913c595902a11ea506b2b7" | 179 | SRCREV_qtwebengine = "dbc0d09be2bbc3dce01ace956f534c4012402fba" |
180 | SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" | 180 | SRCREV_chromium = "7a779d0160771dcf6b4a644bc11137753c25982c" |
181 | SRCREV = "${SRCREV_qtwebengine}" | 181 | SRCREV = "${SRCREV_qtwebengine}" |
182 | 182 | ||
183 | SRCREV_FORMAT = "qtwebengine_chromium" | 183 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 01538d0d..13100384 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 = "9007ba49d14ef56e56a2114685ddd5b23e25f5c8" | 21 | SRCREV = "3581cde283545b907671d0cc42eeda6cbdeccb66" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 59f5cd85..084227df 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 = "0f1373617f2d1c562fd448fee207f7d99a0191bc" | 14 | SRCREV = "465c6c3914455e8ed20f938e5d4a35e6decb446c" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 60733298..ebabd163 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 = "3ae7d8eac3a46b5a70d71c556703ce2f21c169dc" | 22 | SRCREV = "57f656a964aa9fdeb966d14eddc39f62a989b86b" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index aca99236..abec0c1b 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "b5c05ebc46fde8e98e388cd5bf86795b040da505" | 15 | SRCREV = "35ae66f89959e1dd98648cc4033e153e1e5240b4" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 103648eb..0c8daed0 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,7 +25,7 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "f969bdea083012282806ae83a38ace53ef1ba600" | 28 | SRCREV = "cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||