diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 12:34:34 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-29 06:33:42 +0000 |
commit | c96f9b3eba0ff3daebbf213d7abb915ebeee6f66 (patch) | |
tree | 3d5b69757619162313c9ed3d674b534f9aeafdb7 | |
parent | baf9b8e6918c76d7f58d557d9a102b5b5d1727c0 (diff) | |
download | meta-qt5-c96f9b3eba0ff3daebbf213d7abb915ebeee6f66.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.12.4 branch
Task-number: QTBUG-75966
Change-Id: I481a2f9a7e8ac3cd28c0c32b793c3fcd11124cb2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
42 files changed, 73 insertions, 70 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index be7b2eb6..d50571fb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
193 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
194 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
195 | 195 | ||
196 | SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" | 196 | SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" |
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 c09abf5f..ccfd1a62 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 = "29c20fda753f25bd142e18d511d28da68c6361c2" | 39 | SRCREV = "c4b5dbe1e015889b72defca4418717c5854a7acc" |
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 0893a120..98678e49 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.4+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index eb9b5514..9d657c18 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -141,4 +141,4 @@ do_install() { | |||
141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 141 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
142 | } | 142 | } |
143 | 143 | ||
144 | SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" | 144 | SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" |
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 00e994db..1e6af85f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
275 | 275 | ||
276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 276 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
277 | 277 | ||
278 | SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" | 278 | SRCREV = "a275f1eca3de6c497535e43d6452e89b5380fd8d" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 76b6dc54..ae46b980 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 = "912b9b3b1318aac4cef681315ae1588105eaf410" | 14 | SRCREV = "ad446ce15b43b5f9e2f6353cc64a52ac52ed98a2" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 84173957..00c76e64 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 = "9755f474a039756b98ce9c2bf0a69809b1396004" | 11 | SRCREV = "39ba71c1ca03ac9b640d3af44ed8e08937b8ce45" |
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 7c3a209f..ce44036e 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 = "6a8a8f328d1782319b4dc0e4b3497e6613e0f864" | 24 | SRCREV = "c6c3241a4713b3ea89837341214625514951f712" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 4465660e..9ffbe9cc 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 = "edabd45add4b440b40e05f742a5a3a8b124cf72e" | 11 | SRCREV = "18c303dc1ed3e8cd8577e93c5223417e320e068d" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 82ae4975..d13837a9 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 = "5ead393eba0fc9d7c05790887c53c3728b023195" | 27 | SRCREV = "bae6f43d8e1fafec2771bdeddffa9edaf1bf6130" |
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 cc19abb2..bd59b940 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 = "cf48d4694edd6a16cd3bf56922ab20d8bd6b7fe7" | 17 | SRCREV = "55bdecfd14b643b222a9aae05ad1671e67be02ee" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d7481ff8..84a46f7b 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 = "8cf6af2c897a822e040015b169fbf13f3db63ebf" | 21 | SRCREV = "7b92bc10c5bb7b5c87421198895eae632d10702b" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3f57d702..2795a843 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 = "17ac003f6072e62ba9de7e75f3de8b8509dcd2c3" | 28 | SRCREV = "43ca053b50d7ed663c6734879070186bf28a0d29" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 84102fa4..b5011a1b 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 = "ae6c0fe18fff0bedced9800b11940f396b66596d" | 12 | SRCREV = "1453a319a048b6b40051014a0861be048b258778" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 442ae146..2e3f4a04 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 = "a8ecb45143823912baef2426f8e352159fcb0f9a" | 34 | SRCREV_qtlocation = "1459f4474282c8804adf01f4faba70944771c5d7" |
35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
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 46b22a01..e8199e01 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 = "cf41d84738f0ed0c779f75db94d413ad938fb901" | 12 | SRCREV = "667888bd8571061baebd03c2fdbc2804dbc92134" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4e657110..6d2ea509 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 = "c7e735198c6cc01201f90b64c8a6d35fc40584fc" | 40 | SRCREV = "9702acf13dde540b292693f330622561c46fc589" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index d0f80291..69b21682 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 = "0da27832617a17788da4fdd6838f8aa6d8c70f65" | 12 | SRCREV = "be4077347fa8d492553e7e08e4fffe0f439fbd4f" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 50f9ac88..f7c580c9 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "9d61cbee4131a8b6774ba242fe6e3f2b2f5e853c" | 21 | SRCREV = "52254ed121dde68293e99b96c4713d360ff6e90a" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 4f19fdd2..6b828c82 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 = "45f2b4a63489c614e0060b511e00245c599fbb70" | 13 | SRCREV = "8eb2ead663a55d6c0bfd83f8914bd2369846df55" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c163ef42..a8593a82 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 = "db38242b288fe3ca8f7461cf344b757a9ca0947d" | 13 | SRCREV = "33e590ea30931306e055fe4a6ae38da8b3fe3d0c" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d9a027d6..6315bce6 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 = "718afd7c3a78a35e3f4073dc6447e6bf3fda82d4" | 20 | SRCREV = "87f79ca0cfe432b7758fa19472cc7133275818c5" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b7b77a4e..6cd6fd92 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 = "043f7582bb2f611120a7693fbe75fa866d046fff" | 27 | SRCREV = "244688018624f5f753efa16f7fe6c7b60a80fda2" |
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 230f7350..d04bb369 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 = "038f6305610a80f39d3416b95b5df96fab0c801d" | 39 | SRCREV = "d7c60f5072fddf7a46f614b12062cedfde26c997" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 16599978..8b33ff3d 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 = "daad96b2b9a4b503aebbea4f77887973dd8ff8ee" | 13 | SRCREV = "bcb916bec1e0b5cbd169367819e825f04115751f" |
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 4655b2a7..83b950bc 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 = "6b7f7f5ceb7a230307c004021a2f16f3dabdf759" | 15 | SRCREV = "d5888b178da6d34704ee074065f176000ffaab29" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index facff866..ee2977d7 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "9102ab868037042cab292dbfaa08f8dfff8ef5a8" | 14 | SRCREV = "144916119e83e342d6b46127fb3ffabaa365b4fb" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4b76a4f7..6287ecdd 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 = "208e76d05719fe2262ff6e162786894ddb3d0fb6" | 15 | SRCREV = "27da5ad525841f7b335318c620cc25410b2606e9" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 164de449..c32af669 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 = "fd12ae24b4542cf2f0df1a34187c4b8c0a408e01" | 15 | SRCREV = "5db971a48bb1a9ed5c4b51254e611d56680bd85a" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 25b87aa9..c3ef7336 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 = "fe5b4f8e7ac984cc4c9698e7d6def9be46b0df7a" | 35 | SRCREV = "fb9a1cdf638145c5003ee18da71e28e424f91b77" |
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 f06ca308..b3b9e4bd 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 = "0987e6cb7f415be17d1240c8cd71719f94a98f76" | 101 | SRCREV = "a975fdb586b87e9578f0c12afe195317dfd2cd5b" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index f1317c90..14cb77af 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 = "152f6935f050e83363f1b4f40c40af7f64ca5df9" | 52 | SRCREV = "56c783d8fd93b8d3e13555da6fa398ddb09cce97" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 36147c31..28a68c0d 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 = "e70a8070ea1e7903221fb980ddf3c23f3e9b0836" | 40 | SRCREV = "07ec3a37bd6bf28a96b8ff228eea86a09550db51" |
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 f2a15500..ee3fd906 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 = "c3574f4ec36f3cab71fcb680e889afc8a16c6242" | 15 | SRCREV = "7cb725d351d909675574a764fc19dd1f53d5c3e6" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c4780d8b..e37d8d9c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -175,8 +175,8 @@ SRC_URI_append_libc-musl = "\ | |||
175 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 175 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
176 | " | 176 | " |
177 | 177 | ||
178 | SRCREV_qtwebengine = "7ba379ecfa575f871a52dc94c9f29e2bfdfc9865" | 178 | SRCREV_qtwebengine = "ddd3d905395298188329df111d3785e07e06e0db" |
179 | SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" | 179 | SRCREV_chromium = "8d400b021591c0b619269317e239d8a750ace140" |
180 | SRCREV = "${SRCREV_qtwebengine}" | 180 | SRCREV = "${SRCREV_qtwebengine}" |
181 | 181 | ||
182 | SRCREV_FORMAT = "qtwebengine_chromium" | 182 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 51cdfdb5..4a4a1617 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 = "10a64558ce927e2df0f2dfe7ff3d786d4737c06e" | 21 | SRCREV = "8fba2d1110bed680941c6fef8ead9bfffeaf0003" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 53dd6b15..e00a3e5c 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 = "c8704b3dbcfecd774244300943b1c63e2bf9841f" | 14 | SRCREV = "9db762ad97338567a614177564f68fee780fefce" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index bec8c326..e786743a 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 = "05657f1c4744123ff63306a56cb699f2cfbc9f92" | 22 | SRCREV = "30b6f89e3694e667aae5700e17926c1761d16d12" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 9b999b7b..781a07c2 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 = "719d3c88670203fca21a3433b553bc2c1434a2ac" | 15 | SRCREV = "2fe9b682bbba406356a38cc4661330259dd97b97" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d1ea2d5c..9aeba39a 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 = "6feae569229fa391454b76450138ce83cf326046" | 28 | SRCREV = "a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||