diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-05 20:34:26 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 07:06:25 +0000 |
commit | 5bbb8d27ca10c38300bfc0c31c68470eb32b7711 (patch) | |
tree | cf91d64b33bd3a76f1bb7620accca0f598c88e81 | |
parent | e26163d066a867ca8f630f7caffff207ef26b4a7 (diff) | |
download | meta-qt5-5bbb8d27ca10c38300bfc0c31c68470eb32b7711.tar.gz |
qt5: update submodulesv5.13.0-beta4
Update to Qt 5.13.0 beta4
Task-number: QTBUG-72311
Change-Id: Ia25415c4fb796bbc7335ae468030be4634ca4085
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
42 files changed, 85 insertions, 82 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 72de6a81..939d8c02 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 = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 196 | SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" |
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 21fdbd4e..05a86a70 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 1e64f9b509e6794c6f01e62443e93f771ac2a65c 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 847507f..286286d 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 847507f..286286d 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 1215076..24c49ad 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 03ec775b..25681f53 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 = "276be935bfeccde733bacd4267abeb978f6efda5" | 39 | SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index b780c5c2..cee1a1c4 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 = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 144 | SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" |
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..155dd63c 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 0edb35edfc5ef383e705b50422796dbd5ba8ef1a 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 3a71376..dd6020f 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 9a7ffaf5..9161af0d 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 = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" | 278 | SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index cf28db5f..b289914b 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 = "beda274e7d8b5a6864b254a9e63b654f3c494139" | 11 | SRCREV = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" |
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/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index e638c523..d73c1ace 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase" | 9 | DEPENDS += "qtbase" |
10 | 10 | ||
11 | SRCREV = "cf5699e4050b200b9ee80bf4a1c8fbcecb2877af" | 11 | SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 15e33eb3..5379d09f 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 = "d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54" | 24 | SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 56aafa95..78de05b3 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 = "7dc2d9302347b87993f5cfed4be5d6b9c3e130bc" | 11 | SRCREV = "cc7f4769a02421575c9f5a61d9b3687af79201dd" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 34a10e66..9d06377d 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 = "8bc3329e2cec4638fa9af274a40dda176bbb7352" | 27 | SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" |
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 ebc273e7..a130c86e 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 = "df36f287894dca61486b6769866718688cce12f3" | 17 | SRCREV = "7d610c6b1a437235cba38848c1af9afd5556dc73" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index a27e99ad..973a2b7a 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 = "085275b92a55a21cbcf8d307a6f52804875deedd" | 21 | SRCREV = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index f7892836..d1905873 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 = "5fba848889ade8eb067b8a54011e20e9d59b4738" | 28 | SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index cb9b3eb1..5544c62f 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 = "60d096199945d39aad92384e3ba9a47be406d650" | 12 | SRCREV = "4443f12461fc9cab42f4229454a390bd9e1ec4a4" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 5003dd94..7064bc72 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 = "b392921e33b4e8d425f1881afb95e6d34e53879c" | 34 | SRCREV_qtlocation = "ca339bc55d6fc617c63e723c43150445fc8ac050" |
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 b77f5b65..af28b74b 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 = "c8a837521b92082d47f986f61ec9ec0263146b7c" | 12 | SRCREV = "72257654cc6f065f64c9218864e1be5f66738e8a" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 887c2f38..b24f2a4c 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 = "d97d618a4884c2535ba787e774f0faa6bce82081" | 40 | SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index f03ec6e2..a63a29e8 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 = "cf5741a44a6c337fa523080838d8e9220f4370c1" | 12 | SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 798996de..b7bdd4ec 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 = "61a2c26fe8831a0a743efd0e179bbe9bf9425235" | 21 | SRCREV = "3a75d0ac951d9ef165d1f33e9812be9346a6c1f4" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 692a4b70..846e6eda 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 = "12c4da762bd29399767538ca716189908e41cc5a" | 13 | SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 6fbc018e..ea059dde 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 = "ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7" | 13 | SRCREV = "a87188ace95ad9818e078aae72cfab7ea4a9cfaa" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 2eb450e8..a5228fbd 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 = "3d44442331ba6f1ba7a5d5ad9f3834993911e288" | 20 | SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 4a0ab40b..5e6d6bdc 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 = "cb9a20c50584eaf950c1fc9a7fd7961a92100046" | 27 | SRCREV = "e7b07a60408285128dedb373316801294ca941b0" |
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 9235f78d..4789cade 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 = "8d2c11ac2352556167dc4a86172cd9bc3a979ed8" | 39 | SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c8e1ee50..1b0e51e7 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 = "acddb0676cafdc83edd08aee87181bf5602d6387" | 13 | SRCREV = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" |
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 81802fd6..aad757cc 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 = "d1a1b62914d592bf0bb382accff29abc610d3fab" | 15 | SRCREV = "ce508999540cb125dad40dd250b17e6ad20d542b" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 6b32ef11..c73f88b2 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 = "fe80eef6b3377c8727c5190d275808c343ee7c75" | 14 | SRCREV = "562113342f2b232d38a3ea05e84b8d2584799218" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index af437ef8..648460db 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 = "f47d1b9a11eb8c56afbd929285724f795097da09" | 15 | SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 06cee877..e7d8872d 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 = "2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7" | 15 | SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 8a1ea59e..3e0f8822 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 = "1562cf0d6129886e16c57ac72fab00b309db6bc6" | 35 | SRCREV = "e363e6400afaa4ddc691bfb5796efd34ecd4f4a8" |
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 2206399e..8b13dba7 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 = "133f635a25ee58596fcb556b87e841257390758b" | 101 | SRCREV = "88266670663256f40019e7163092e17401557d5f" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index b9ba2b4e..21ca0590 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 = "67e497ff407441515761b312599cb4ad6b61adad" | 52 | SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 0ef260da..3e50356d 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 = "458bc86f82f8fa6cfd659950549d1d2b36e5e40d" | 40 | SRCREV = "fb7aa15c2a27a9dc841806d07aee9c39aa3fb2ef" |
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 34f52528..b468ecb1 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 = "24e0c897fac375514396191db7b582505028c918" | 15 | SRCREV = "fdba7f6e285d35757190d99f9880e3bd0380e254" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index bef8ad6d..9e3eeed0 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 | 1 | From a35a1ee7e93610d049da6eb0931f69f2647a93dc 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: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
19 | 3 files changed, 10 insertions(+), 10 deletions(-) | 19 | 3 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 21 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
22 | index dd0d3e32..70161c82 100644 | 22 | index dd0d3e3..70161c8 100644 |
23 | --- a/src/buildtools/configure_host.pro | 23 | --- a/src/buildtools/configure_host.pro |
24 | +++ b/src/buildtools/configure_host.pro | 24 | +++ b/src/buildtools/configure_host.pro |
25 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 25 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -58,25 +58,25 @@ index dd0d3e32..70161c82 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 58 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 59 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index 30ada93..afd115c 100644 | 61 | index b6bf9cf..ae419b1 100644 |
62 | --- a/src/buildtools/gn.pro | 62 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 63 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { |
65 | gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) | 65 | gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) |
66 | 66 | ||
67 | gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ | 67 | gn_gen_args = --no-last-commit-position --out-path $$out_path \ |
68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ | 68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ |
69 | - --ld \"$$which($$QMAKE_LINK)\" | 69 | - --ld \"$$which($$QMAKE_LINK)\" |
70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ | 70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ |
71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" | 71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" |
72 | macos { | 72 | |
73 | gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" | 73 | msvc:!clang_cl: gn_gen_args += --use-lto |
74 | } | 74 | |
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
76 | index 04c9eca..c48fa06 100644 | 76 | index 95b7a4b..db0658e 100644 |
77 | --- a/src/core/config/linux.pri | 77 | --- a/src/core/config/linux.pri |
78 | +++ b/src/core/config/linux.pri | 78 | +++ b/src/core/config/linux.pri |
79 | @@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") { | 79 | @@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") { |
80 | 80 | ||
81 | host_build { | 81 | host_build { |
82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 1e9f0cfa..afbe1de6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -171,8 +171,8 @@ SRC_URI_append_libc-musl = "\ | |||
171 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
172 | " | 172 | " |
173 | 173 | ||
174 | SRCREV_qtwebengine = "5de670283e3093fcdd2a91dcca30ffbe0b03d230" | 174 | SRCREV_qtwebengine = "0835dfa3f9b2b20f6f40ee0c2140d5222ed4fff5" |
175 | SRCREV_chromium = "4679cc537c8358afa61918d119ceb629593a4d4d" | 175 | SRCREV_chromium = "00390e99a0041585e1b4ae6dcc6ff12a3d64c743" |
176 | SRCREV = "${SRCREV_qtwebengine}" | 176 | SRCREV = "${SRCREV_qtwebengine}" |
177 | 177 | ||
178 | SRCREV_FORMAT = "qtwebengine_chromium" | 178 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 2e5dc217..b5760229 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 = "c21dbf122e57ee90436de65a7f868fd8ce5a377b" | 21 | SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index f5fdabf0..b4a10936 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 = "74c8ebe9696c981311f19bdd6544634ab1b7cc7f" | 14 | SRCREV = "142d9798d262a41c09a9c43f3ae3a82c771fc800" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 4766f9da..dc2a3e4b 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 = "d895829904a1de3f8a63d5ab56e73106847fddcf" | 22 | SRCREV = "3265fa961a27894faa5b3413fb39c8682266a72f" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 19a372f0..31c5b671 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 = "431bd11f304179c77f55edd07d68b02d8408a45c" | 15 | SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8bf5460c..73631fcd 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 = "c886d992029740da0185fd2bf8a040c84156e73d" | 28 | SRCREV = "29891df4ce099542635e33891945ba19f3e9572c" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||