diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-12 13:07:23 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-18 10:22:32 +0000 |
commit | 57a6353c8ad25d68192bfb22b3f7f3f0ca1241a4 (patch) | |
tree | da6137b2e6982b90e3879b140b831d87f9e8338a | |
parent | 270fb283c271f24eee7d9f5b45ff29066865b923 (diff) | |
download | meta-qt5-57a6353c8ad25d68192bfb22b3f7f3f0ca1241a4.tar.gz |
qt5: update submodulesv5.13.0-beta1
* Update to Qt 5.13.0 Beta1
* QtCanvas3D recipe removed as the module has been removed from Qt 5.13
* New recipe added for QtLottie
Task-number: QTBUG-72311
Change-Id: Ib5eb563f94c01149a50a6cec9d61c9de6571be6a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
33 files changed, 53 insertions, 55 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87957cb4..9fa00df2 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 = "99e9666492095e3b96ac16f03e28f20288cc0af6" | 196 | SRCREV = "a9cd8ce2961190e51c59cdd34c26c5b6f4c70aa1" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a510276e..a7f9ca30 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 = "e8f551be32913f5a9f9e9ce011b172a4a2a366b0" | 39 | SRCREV = "fa63d206ced9a6253cd81acf4c82fa49d85c3352" |
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 af3483d5..38e71218 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -139,4 +139,4 @@ do_install() { | |||
139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
140 | } | 140 | } |
141 | 141 | ||
142 | SRCREV = "99e9666492095e3b96ac16f03e28f20288cc0af6" | 142 | SRCREV = "a9cd8ce2961190e51c59cdd34c26c5b6f4c70aa1" |
diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index b4e98a3f..552c7513 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 852a06e11ece7b1a74785bdea2235583d0275007 Mon Sep 17 00:00:00 2001 | 1 | From ec343b946779a13d77ec1740605f6f5fe75077f3 Mon Sep 17 00:00:00 2001 |
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | 2 | From: Max Krummenacher <max.krummenacher@toradex.com> |
3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 | 3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 |
4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to | 4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to |
@@ -19,7 +19,7 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | |||
19 | 1 file changed, 8 insertions(+), 14 deletions(-) | 19 | 1 file changed, 8 insertions(+), 14 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in | 21 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in |
22 | index 07869efd7d..671aa82167 100644 | 22 | index 84dbbfe..ad6956d 100644 |
23 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in | 23 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in |
24 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in | 24 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in |
25 | @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) | 25 | @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) |
@@ -48,9 +48,9 @@ index 07869efd7d..671aa82167 100644 | |||
48 | -!!ENDIF | 48 | -!!ENDIF |
49 | + | 49 | + |
50 | foreach(_lib ${Libs}) | 50 | foreach(_lib ${Libs}) |
51 | string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) | 51 | if (IS_ABSOLUTE ${_lib}) |
52 | if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) | 52 | get_filename_component(_libFile ${_lib} NAME_WE) |
53 | @@ -158,11 +152,11 @@ endmacro() | 53 | @@ -171,11 +165,11 @@ endmacro() |
54 | 54 | ||
55 | 55 | ||
56 | !!IF !isEmpty(CMAKE_EGL_LIBS) | 56 | !!IF !isEmpty(CMAKE_EGL_LIBS) |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 87183c26..37db6196 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -263,4 +263,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
263 | 263 | ||
264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
265 | 265 | ||
266 | SRCREV = "99e9666492095e3b96ac16f03e28f20288cc0af6" | 266 | SRCREV = "a9cd8ce2961190e51c59cdd34c26c5b6f4c70aa1" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb deleted file mode 100644 index 1009b940..00000000 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require qt5.inc | ||
2 | require qt5-git.inc | ||
3 | |||
4 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
7 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
9 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
10 | " | ||
11 | |||
12 | DEPENDS = "qtdeclarative" | ||
13 | |||
14 | SRCREV = "1319e0965f6008f44f9216a7bb76e106a1710767" | ||
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 462a1a88..25f66a59 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 = "c01b60a4882f256eea58ffc87d3aac9ce146f98d" | 11 | SRCREV = "b06501840033f8aa001aa13fa9abcaef921604f5" |
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 91eae87f..22f783ad 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 = "cc615e02420769e61993e6183897087992a47d6c" | 24 | SRCREV = "b6f4d00b1ed8942df0832bb179de2ea331fc6755" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index b12dea39..dbe75231 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 = "7044c0c82c1bccbff9f7ab0d8344c89fcf7cc043" | 11 | SRCREV = "d0ece82c68825a25a55ecaa148bd36f161e351e1" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3fb847c6..063d6017 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 = "fee0fcfef08a05ed4ba9369d2352c876b514d69c" | 27 | SRCREV = "850aaa0fb43f64a2d9cf5160fd6c54dd552cd6a5" |
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 5fa6f382..114a369c 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 = "419bc7bc6e469ac88522ee9dabcf36ac1c66280c" | 17 | SRCREV = "604611dffd0a63558dc5a1bc40654ceb8448f19f" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6ff96dfd..7fdd51e1 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 = "0fc226b32789adee140951c63739da65a081d211" | 21 | SRCREV = "6ffa20bc5fb4ee1c556ab09a15e6e2be3b011fb9" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 8777cc23..7ec18927 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 = "8b1f48f3136e65b7d9f29981d8af8f4956a4fd5f" | 12 | SRCREV = "3624b9c54631464b2c3577b4c0943af072bf655d" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index da882baa..3fde5b82 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 = "dc6b519f08916b8e48d27700e87c3e355fffbd33" | 34 | SRCREV_qtlocation = "9f86b7353f1cdb01fe98efa8130fb6ccb5b4337d" |
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/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb new file mode 100644 index 00000000..6f46a0fe --- /dev/null +++ b/recipes-qt/qt5/qtlottie_git.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require qt5.inc | ||
2 | require qt5-git.inc | ||
3 | |||
4 | LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" | ||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
7 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
8 | " | ||
9 | |||
10 | DEPENDS += "qtbase qtdeclarative" | ||
11 | |||
12 | SRCREV = "11194e8c38f5a8eef11f9d9e9b72508d8923722d" | ||
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index e657fb35..b7004d98 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 = "4077428310aefb64b8030ea0da00343afc986e1a" | 40 | SRCREV = "9a5bae4ed9ca10fedf842b5c293d1c0ef918c8af" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 5d13bbe7..c64ecf35 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | 12 | ||
13 | SRCREV = "1274cfe8d2be35105007c6895f6104a679d075e0" | 13 | SRCREV = "2796e9759909119236946cb2a5e0fc11347ffb98" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 80e21120..ff90d4cc 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 = "4c873e79bd9d02b707392aacf3699fdca3c990ec" | 13 | SRCREV = "9363738ed780d32b40f2428ca5dfa1c919db424e" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e44dbd0e..7354dcca 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 = "3b467b5c5b34795fc4dfcd9cb8822aa3a3d8cf1c" | 13 | SRCREV = "e8b3db1bedf1c62f810d26d17ce91a687448bcc4" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index fb4225f6..c6871faf 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 = "ee36ee7f7352b08da15d4e4875e93256e4cdc245" | 20 | SRCREV = "d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d4ab7063..729a666a 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 = "9387eae35fe82b441c6349a866929e855363db45" | 27 | SRCREV = "f7921b5f67cfe2e83d282f470128524f3fdee238" |
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 25c16288..e2271575 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 = "313e6548b0393af9069b043f65ea6e6c0a546487" | 39 | SRCREV = "2a106f26d6030063be5d25726d0f4b5e6a1d50b3" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 168a6c44..89e9edee 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 = "0c023adada49bab1098e7df274ad7889828ef439" | 15 | SRCREV = "8ca3b32561b68bed3b5897e87aa912c93e9739c4" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 249bd87f..87d24a0b 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 = "f008b2dd19f81af91b0fa7ddc7805a6cc0e381a7" | 35 | SRCREV = "177b92c4d499b6ffc5986d7c46c8c3c98d08f130" |
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 47f92016..cdd86aa9 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 = "f9b9f4753ca8cd4ef978e61db6125b9fba668c0e" | 101 | SRCREV = "f74de77d311235cebc1f0769e48aa22f420d52d4" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 4440a470..70d0e72f 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 = "45506f4fcbc945ccc7bbb34d95776875ea0f97c1" | 52 | SRCREV = "4a2701a05400f0621cef04980c419637ff6d1d00" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 1ff6ff84..c579d750 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 = "cf378b581009b80510cf54c8b56d4c2d950c1153" | 40 | SRCREV = "eabdc86b3a8bc1c94c917166667c3aed57f049f8" |
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 3cb32209..b59f3fe1 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 = "7fa4cf258af693f0fe61e5006ad83a91c63a45df" | 15 | SRCREV = "3809bdf15524e65397447eb7ba62a289c5ef58d4" |
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 54480b77..544e5ebe 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 8a07ea88666132e3ca944d0d5784235420c3d382 Mon Sep 17 00:00:00 2001 | 1 | From 4bd5ee8a79729c29795568568a9cd7a01d9c338b 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 |
@@ -58,7 +58,7 @@ index dd0d3e3..6312c86 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 7766af0..9d578c8 100644 | 61 | index 30ada93..afd115c 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 { |
@@ -66,12 +66,12 @@ index 7766af0..9d578c8 100644 | |||
66 | 66 | ||
67 | gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ | 67 | gn_configure = $$system_quote($$gn_bootstrap) --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)\" --ar \"$$which(ar)\" | 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 | message($$gn_configure) | 72 | macos { |
73 | !system("$$pythonPathForSystem() $$gn_configure") { | 73 | gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" |
74 | error("GN generation error!") | 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 04c9eca..c48fa06 100644 |
77 | --- a/src/core/config/linux.pri | 77 | --- a/src/core/config/linux.pri |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index cb75508e..6d3868af 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
173 | " | 173 | " |
174 | 174 | ||
175 | SRCREV_qtwebengine = "05369331163c3c07907c2caed98e3eaabbdfe023" | 175 | SRCREV_qtwebengine = "dc6c8d5c9fe61ba58d065564f4d6dc0571475004" |
176 | SRCREV_chromium = "bb8520a5b4a49085e38b70cb4c95baf75ea374e9" | 176 | SRCREV_chromium = "0aae24c2876d19946ce0d28adc38c3dbed2c6549" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 178 | ||
179 | SRCREV_FORMAT = "qtwebengine_chromium" | 179 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 60ce95e0..e37efd69 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 = "3b925727801483809c963acb7df08dae0f3d0e8a" | 14 | SRCREV = "d14e55f660d0b5e36e7d83b830c6422328a485d8" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index a96fd25f..c46ac3b6 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 = "b9864e03bec6753b0407e8ba784b15bb4394362c" | 22 | SRCREV = "cd0cb72a2cd219af5faade928c06b61df715b14b" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index c12b0234..47c747d4 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 = "9010c97bfb341166f963090935a0694a7ac5e929" | 28 | SRCREV = "9c1abb9c6666b66fcef4ca963ba4f290695ffc90" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
31 | 31 | ||