diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 12:38:41 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 07:01:47 +0000 |
| commit | 0ab7116f9cbb93b3132481731db296245044fbff (patch) | |
| tree | 3a57782f805750428233c812f37e897fa7a1a994 /recipes-qt/qt5 | |
| parent | 54ff6c13316cc975852c9712d7086de5ff32da6a (diff) | |
| download | meta-qt5-0ab7116f9cbb93b3132481731db296245044fbff.tar.gz | |
qt5: update to Qt 5.11.2
The commercial Qt license agreement was added in qtbase, use that
as the The-Qt-Company-Commercial license. Remove old licenses that
are no longer used.
Change-Id: I25172c46b36c3b342ef0cf89ba9741c7c9fc7b7e
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
36 files changed, 45 insertions, 49 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 595e5858..6ee5334a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
| 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 14 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | QT_MODULE = "qtbase" | 16 | QT_MODULE = "qtbase" |
| @@ -210,4 +209,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 210 | do_generate_qt_environment_file[umask] = "022" | 209 | do_generate_qt_environment_file[umask] = "022" |
| 211 | addtask generate_qt_environment_file after do_install before do_package | 210 | addtask generate_qt_environment_file after do_install before do_package |
| 212 | 211 | ||
| 213 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 212 | SRCREV = "85913b4afcee5ff0b0fa7d375ae735615b03b53d" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index bd87dcb2..fafac986 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
| @@ -36,6 +36,6 @@ do_configure_prepend() { | |||
| 36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | SRCREV = "3b4a9b50618210c08dc08ae0e2dcf3b8d495eccf" | 39 | SRCREV = "895cd926ba6d420e72a7d2ae2bb0624ab7aeb791" |
| 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 d6497179..7128301c 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.11.1+git${SRCPV}" | 17 | PV = "5.11.2+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 819f4473..97addb4f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
| 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 14 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | require qt5-native.inc | 16 | require qt5-native.inc |
| @@ -135,4 +134,4 @@ do_install() { | |||
| 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 136 | } | 135 | } |
| 137 | 136 | ||
| 138 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 137 | SRCREV = "85913b4afcee5ff0b0fa7d375ae735615b03b53d" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 001838bc..c68a963e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 8 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 9 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 10 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 11 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
| 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 13 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 12 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| @@ -249,4 +248,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 249 | 248 | ||
| 250 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 249 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 251 | 250 | ||
| 252 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 251 | SRCREV = "85913b4afcee5ff0b0fa7d375ae735615b03b53d" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 1f551f41..9be6d3d6 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "cab02f1401ef10a06929c3681e45c57a02e15bec" | 13 | SRCREV = "43f3a363133a93e2c6e465d149476a18f3a5d4e5" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d2061d20..d2ac5fa6 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 8 | 8 | ||
| 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
| 10 | 10 | ||
| 11 | SRCREV = "2ad3020dfee0af78bf4e3f90fd43b6d45679b468" | 11 | SRCREV = "85df7a646759b6504de463692e144016a47e183e" |
| 12 | 12 | ||
| 13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
| 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index c7f9dd8b..d33efd99 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
| @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
| 19 | 19 | ||
| 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 21 | 21 | ||
| 22 | SRCREV = "c7f826f0c07c05948c3882242ce4d2ea0ced8a6f" | 22 | SRCREV = "9b7a4c10b67dd7d89ed30f1f94d8982dab47ded0" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e58a50c0..1cd330d5 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
| @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 8 | 8 | ||
| 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
| 10 | 10 | ||
| 11 | SRCREV = "3b44cb4c0ae44deb6d5d941038fd9a2348aa8d01" | 11 | SRCREV = "4d2d9a85932e960e39396b375a7842756c8415fe" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 69e90570..5524460c 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
| 32 | 32 | ||
| 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
| 34 | 34 | ||
| 35 | SRCREV = "68e282f510d5f5ee490ffdb0500f90e0932b8cef" | 35 | SRCREV = "44e4f8b360367bc846f1d9cbe55876466fea4356" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index d8d2250e..a021b72b 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
| @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
| 14 | 14 | ||
| 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 16 | 16 | ||
| 17 | SRCREV = "4d393b920d984ec763c89e3fce7aab6d1af344fd" | 17 | SRCREV = "8f7dea835e63cd78648090fbc19ad7cb23ac642c" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 2a34a245..ba1d3a79 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
| @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
| 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
| 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 20 | 20 | ||
| 21 | SRCREV = "e954783bd9cdf490a7ffb2a9dc02f1031890d4ea" | 21 | SRCREV = "a67f916c317c9d9fa57f222a6dfe140b928935a7" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 2d9c078d..c516a3e7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
| @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
| 26 | 26 | ||
| 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 28 | 28 | ||
| 29 | SRCREV = "e945d172fef9ae8d3ce2d925c53316a3433ce034" | 29 | SRCREV = "177c85c58db23aad28a7445956cab7f062caaa94" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ff7cc574..bfeea2a3 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
| @@ -31,7 +31,7 @@ SRC_URI += " \ | |||
| 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
| 32 | " | 32 | " |
| 33 | 33 | ||
| 34 | SRCREV_qtlocation = "f8a0ae9109c2ee56a0480cbe62f07239afb31392" | 34 | SRCREV_qtlocation = "ec8152a98b8971af6020dbee5a2885a525a53f88" |
| 35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" | 35 | SRCREV_qtlocation-mapboxgl = "b59b0450c60b3df9e0852f62f6c8a6024889cd9e" |
| 36 | 36 | ||
| 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 69ca00e7..3a1382b1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -37,4 +37,4 @@ SRC_URI += "\ | |||
| 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 39 | 39 | ||
| 40 | SRCREV = "dfefe794b9d87fd04c9a529e1ca0aa1d18d44ddd" | 40 | SRCREV = "135c762ea0bb2c13f9568b9c85b10633f0c6ce34" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 1704ff55..8c876eb0 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
| @@ -9,4 +9,4 @@ require qt5-git.inc | |||
| 9 | 9 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "c4b57f78900fdb21a8dd99cf8045f5c678eb656c" | 12 | SRCREV = "55b80f9e7b0a81cf6c80ae0a381a20641194c09e" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 1e2b2205..494d6203 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "1e9e0c388920af7e56fa9fb0fef81e23e9807062" | 13 | SRCREV = "44a9a2a2f061660ac61cad4b47c7301c63135e88" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 31e1862c..7d3fd58b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
| 12 | 12 | ||
| 13 | SRCREV = "5d482466d1cfa3292e01edacc429addbbd9fec29" | 13 | SRCREV = "1b94294a34150a051f78b97278047a8ed173213c" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 5d02ecd9..9d529145 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
| @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
| 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "191a2fe59cbaf7603d502fa764b4737f49422010" | 20 | SRCREV = "3b71eea2e6e712103452c98756cd6ce53aa4ebca" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b998922e..e4e48d21 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
| @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "cc454911ac5aec527379c2e51259583071d21ca9" | 27 | SRCREV = "65b338416e5846c3d41f0286ad3020f4a5132e45" |
| 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 913d8c69..dc4bed03 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
| @@ -30,4 +30,4 @@ DEPENDS += "qtbase" | |||
| 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
| 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 32 | 32 | ||
| 33 | SRCREV = "18c09cd0a3dd8143256fbe22b8e62aea346d17f1" | 33 | SRCREV = "1d2294735536c53fca8e56ed4b262c4bca6b4d29" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 503f9dbf..212bead4 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
| @@ -10,7 +10,7 @@ require qt5-git.inc | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
| 12 | 12 | ||
| 13 | SRCREV = "de31ea0edc5ed6511bf635aa75f5d5c6f9aedc94" | 13 | SRCREV = "cf06df0f8e0488be366aab2645fd5470992c8a4e" |
| 14 | 14 | ||
| 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 |
| 16 | # 5.11.meta-qt5.4 | 16 | # 5.11.meta-qt5.4 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index c8543ea5..d47efcb7 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
| 14 | 14 | ||
| 15 | SRCREV = "b99d3da32b62e2a4c4d907928a5a73bc441db345" | 15 | SRCREV = "b2765e0922699afd654ef77e849148dba41384c0" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 118de788..223886b7 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 = "a59be66ab8b74f074f171b8fe4b75368483a8d4e" | 14 | SRCREV = "9fe2ea2e0d8e696d7ba7d2dd03325007c2e415cc" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 0ce23ca1..aa899f18 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
| @@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 14 | 14 | ||
| 15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
| 16 | 16 | ||
| 17 | SRCREV = "1926ea36a923088e8765fb37f0c3a76fcfbc4994" | 17 | SRCREV = "ca6052a651b63b05a4deb6c85a2e627ab022264a" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 63ed6e11..10794fa8 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
| @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 13 | 13 | ||
| 14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
| 15 | 15 | ||
| 16 | SRCREV = "44ebf2803840555a60969fcca5f8f39eb3348939" | 16 | SRCREV = "59c8f354644b6016c6e0ac45e60d821544c6d4d2" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 678624dc..763381da 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
| 29 | 29 | ||
| 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
| 31 | 31 | ||
| 32 | SRCREV = "a01f3629377f25506d523406d2b93ffbff711a51" | 32 | SRCREV = "4ec82667f632992e827299c96d3bfd2b221a029b" |
| 33 | 33 | ||
| 34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
| 35 | 35 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index d3e2c353..57a26061 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
| @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
| 49 | 49 | ||
| 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
| 51 | 51 | ||
| 52 | SRCREV = "62dad13b1fb2fcf04c61700d3c477b998db2f63e" | 52 | SRCREV = "f71bd1863a1f29f4f19d5be05bc0f422e5cbffb0" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 1643fc26..214cfef6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
| 37 | 37 | ||
| 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 39 | 39 | ||
| 40 | SRCREV = "3ffa7d5d6ecb75c244c6b22565df5184c638643a" | 40 | SRCREV = "4d5af47cd679ef760c4522f731169da08f577483" |
| 41 | 41 | ||
| 42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
| 43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 3fc1465f..50a55655 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
| 14 | 14 | ||
| 15 | SRCREV = "2ff27bf60e3bda8335adc557abd6486c144cb948" | 15 | SRCREV = "ed82d154255b1bde0e44f0be174cee6e90173f86" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 11ee347e..2dfb50a5 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -160,8 +160,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 160 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 160 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
| 161 | " | 161 | " |
| 162 | 162 | ||
| 163 | SRCREV_qtwebengine = "fe73e5405716531e85440772f69ad74943024eee" | 163 | SRCREV_qtwebengine = "730e74c1da6cac774c4d7d861559ea37d845913e" |
| 164 | SRCREV_chromium = "bad02200c68d7e0c758dc4f1805e58d0e03fdea9" | 164 | SRCREV_chromium = "7f6fe4d90fb2fd831071209beebde0044d7d8858" |
| 165 | SRCREV = "${SRCREV_qtwebengine}" | 165 | SRCREV = "${SRCREV_qtwebengine}" |
| 166 | 166 | ||
| 167 | SRCREV_FORMAT = "qtwebengine_chromium" | 167 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index c5605b4a..eb823fca 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
| @@ -18,4 +18,4 @@ do_configure_prepend() { | |||
| 18 | 18 | ||
| 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
| 20 | 20 | ||
| 21 | SRCREV = "c40e4790835bd91a36bb19183d0799ff56555964" | 21 | SRCREV = "bdbbafb0f842530757c4e1a13072e0d3a514d1cb" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index de058c5d..2a63572c 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
| @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | 11 | ||
| 12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
| 13 | 13 | ||
| 14 | SRCREV = "d99ae2d542515cf53faa5998c1a8e6b9204a6470" | 14 | SRCREV = "2954e0112aac4d76aa8c78b3261de665621edbc6" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 90917fb5..063b89a9 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
| @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
| 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
| 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
| 21 | 21 | ||
| 22 | SRCREV = "8515dd6e203e596c7dbec5b950b3354a8012dd72" | 22 | SRCREV = "1ac5e98a02f4467033c1159860b20e4b6a5d45c4" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index c53e0b21..a7568f2e 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
| @@ -1,16 +1,15 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | require qt5-git.inc | 2 | require qt5-git.inc |
| 3 | 3 | ||
| 4 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" | 4 | LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" |
| 5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
| 6 | file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ | ||
| 7 | file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ | ||
| 8 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ | ||
| 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
| 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 6 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 11 | file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ | 7 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 8 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
| 9 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
| 10 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | ||
| 12 | " | 11 | " |
| 13 | 12 | ||
| 14 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
| 15 | 14 | ||
| 16 | SRCREV = "a3570e9bab1abe5c80e00ddc10ae688c654c1427" | 15 | SRCREV = "b0fa702623fc8ed600c1c285a3fa5b80d29b5c0c" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d75e47d5..fe195f3f 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
| @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 14 | 14 | ||
| 15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
| 16 | 16 | ||
| 17 | SRCREV = "f6b06147b0065b1809c0a081fceec6f524dec2a4" | 17 | SRCREV = "df2fb4bbe406ffa080f2ada087822cf74aa2bd81" |
| 18 | 18 | ||
| 19 | BBCLASSEXTEND =+ "native nativesdk" | 19 | BBCLASSEXTEND =+ "native nativesdk" |
| 20 | 20 | ||
