diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-25 13:00:52 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-11-01 13:31:22 +0000 |
commit | e908589afec25bc9291f77266a6d50846e91be7b (patch) | |
tree | 81bbff7c0be777cad8cd4454ef7febfc1f3864ef | |
parent | d3420f1e481a2230f1c6c325fadd04490174b301 (diff) | |
download | meta-qt5-e908589afec25bc9291f77266a6d50846e91be7b.tar.gz |
qt5: upgrade to 5.9.7
* Update to Qt 5.9.7
* qtbase: default to internal harfbuzz-ng:
With -no-harfbuzz, Qt uses internal copy of harfbuzz-old, which is
no longer maintained, and is extremely buggy. Instead, use the
harfbuzz-ng version if system harfbuzz is not used.
Signed-off-by: mikko.gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
36 files changed, 37 insertions, 67 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 0b6b7ce4..fe96f3d7 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -200,4 +200,4 @@ fakeroot do_generate_qt_environment_file() { | |||
200 | 200 | ||
201 | addtask generate_qt_environment_file after do_install before do_package | 201 | addtask generate_qt_environment_file after do_install before do_package |
202 | 202 | ||
203 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" | 203 | SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3eadbb9f..7da321a5 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -37,6 +37,6 @@ do_configure_prepend() { | |||
37 | ${S}/src/quick3d/imports/input/importsinput.pro | 37 | ${S}/src/quick3d/imports/input/importsinput.pro |
38 | } | 38 | } |
39 | 39 | ||
40 | SRCREV = "ea18da8361e8406cf1cb567a407429afcd65552a" | 40 | SRCREV = "de5e7839d638a2cf27703a337d004e3e5a557c82" |
41 | 41 | ||
42 | BBCLASSEXTEND += "native nativesdk" | 42 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index f55a2c07..71333edb 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.9.6+git${SRCPV}" | 17 | PV = "5.9.7+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 698418d5..0ab5feb4 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -125,4 +125,4 @@ do_install() { | |||
125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 125 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
126 | } | 126 | } |
127 | 127 | ||
128 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" | 128 | SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c1006ca2..eb2f35e8 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -101,7 +101,7 @@ PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" | |||
101 | # fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype | 101 | # fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype |
102 | # works only together with fontconfig | 102 | # works only together with fontconfig |
103 | PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype" | 103 | PACKAGECONFIG[freetype] = "-system-freetype,-qt-freetype,freetype" |
104 | PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-no-harfbuzz,harfbuzz" | 104 | PACKAGECONFIG[harfbuzz] = "-system-harfbuzz,-qt-harfbuzz,harfbuzz" |
105 | PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" | 105 | PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" |
106 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" | 106 | PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" |
107 | PACKAGECONFIG[gif] = "-gif,-no-gif" | 107 | PACKAGECONFIG[gif] = "-gif,-no-gif" |
@@ -220,4 +220,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
220 | 220 | ||
221 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 221 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
222 | 222 | ||
223 | SRCREV = "9c50112304033c631e52f062496f3111f24835a2" | 223 | SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 6fa59267..91479411 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 = "569495de338821ad89153b69a59a5364fc96a49a" | 13 | SRCREV = "18d8003c31dfd79acf0c4c811ea2cfa7b8472835" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 3035d5af..74fdae8c 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 = "6acb93f08af0133d3230cd7f9db5f9e0146d7fbf" | 11 | SRCREV = "7c1ea2526f2d6103ca2e68f8288ab2de42e3965a" |
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 6995b970..bb7bc37f 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 = "513e69bd6aca390d7e6ef28d3527c24dee99ee2b" | 22 | SRCREV = "8cdcc580a2b38cf7f43bd62de13e11e201647a4a" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index f1dfaa8d..7067abe7 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 = "4d2efb91ebbdc08ca70ee63a479367d75d5a6357" | 11 | SRCREV = "fbd774738f9c67f6fccd7e0826fb42793223320e" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 8f49d97e..11a0868b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
32 | 32 | ||
33 | SRCREV = "283a900c4e8518fef33a2c89cb597fbf1e6ad78c" | 33 | SRCREV = "9e5de38fbb1d46d2fbd3ace3d5267a2e708d144d" |
34 | 34 | ||
35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 01d97de8..4b4a8fc3 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 = "91b692255f5cb7012000694ff46ea0346293baf5" | 17 | SRCREV = "27a786da9f33c8911735438856f26224526f4661" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 27488ced..f58e2522 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 = "f61dcaa5e5ef8f5da1b37b25e4bd17469e72ce55" | 21 | SRCREV = "1489bbaad9e7d8b1c415e0904a15dd7dd6eb78bb" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index c219098f..051243d6 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 = "e9daef6d8f60015906c1e62e2875b2b6c1494465" | 29 | SRCREV = "a90c09c2e6fa845b7951c27e6970dbb7677ddc99" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index cd241676..6b2315b1 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,7 +29,7 @@ SRC_URI += " \ | |||
29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV_qtlocation = "b0dd210c2dccd7c1c295cc8cba9872fae6dffe54" | 32 | SRCREV_qtlocation = "018773949e3ed64d00fb82413aa7d63f3b295941" |
33 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" | 33 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" |
34 | 34 | ||
35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index b68ec9f4..9f67e014 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 35 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
37 | 37 | ||
38 | SRCREV = "52f5785cfa8193f85859a27caebeb2a10f894f67" | 38 | SRCREV = "2a3c5de691ae25ca37b91cd54bacddb8187ba52f" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 7c89245c..8b874fa3 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 = "92f6d5d612ec3f6ef702ab55d4887c7b06883bc8" | 12 | SRCREV = "441a232141f155a903b0c10c3a9d9bb4b39fe490" |
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch deleted file mode 100644 index 930bb6d8..00000000 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From ad1e13ce8ff07ca8813e6129fb0525b086a6e3a6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 | ||
4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
9 | --- | ||
10 | .../quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
14 | index 69da88f0..9039191e 100644 | ||
15 | --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
16 | +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | ||
17 | @@ -54,6 +54,7 @@ | ||
18 | #include <QtGui/QTextCursor> | ||
19 | #include <QtGui/QFontDatabase> | ||
20 | #include <QtCore/QFileInfo> | ||
21 | +#include <QtCore/QDebug> | ||
22 | |||
23 | DocumentHandler::DocumentHandler() | ||
24 | : m_target(0) | ||
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 0d4606d1..83744c69 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" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "c48b314edef0595fbfa16dc62ce38b8d615326c8" | 13 | SRCREV = "f4af8a1987cc3fed8120062fbeb5659c7b2b77df" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 47708759..72b1009b 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -19,10 +19,4 @@ FILES_${PN}-qmlplugins += " \ | |||
19 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 19 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
20 | " | 20 | " |
21 | 21 | ||
22 | # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 | 22 | SRCREV = "1afae24d7f3a67b2727ec6283c44275935de55e1" |
23 | # 5.9.meta-qt5.6 | ||
24 | SRC_URI += " \ | ||
25 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | ||
26 | " | ||
27 | |||
28 | SRCREV = "ca6bba7163850222ea8b71dd7db9c70de56a0d4e" | ||
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index de5eca81..56f823e3 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 = "7aef155a56954da9cb29b36672b0ef7e8727010a" | 27 | SRCREV = "b0a23414763c9c268cb6f02a0d5f2189fda0e339" |
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 8b8a6cab..7d7ceea6 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 = "bc1c3fb95cee0ee525642bd308abbff21572505e" | 33 | SRCREV = "da4e4ac0c2c18d7941c218979aa352a86d71df31" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 7d539057..3b8416be 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 = "320735f9a43bd07e4c2b8e9019b5706b00475956" | 13 | SRCREV = "f66526f7ba7332cc7ecca9bd68fca456eae845eb" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 |
16 | # 5.9.meta-qt5.6 | 16 | # 5.9.meta-qt5.6 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 8d8597a6..294f992b 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 = "30044c5a4a1be9553c3db7a3669acd07431b2512" | 15 | SRCREV = "bc655d7a6c255abff91f7b3950f8a0491f9539b0" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cee89df4..967603e6 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 = "6654d88750cf5431086fe1d3187ec87f52533b18" | 14 | SRCREV = "f7669e84496491a2fb08bf13d020aa72071a8f69" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 57fa1030..2ed31ab1 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "0a242c49401571d6a5a294935af02c431cc32143" | 18 | SRCREV = "74c89bb84489166eedf76ff1091f8ad94f0040d0" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index fbe928e6..1db4ecd5 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 = "7a28db8f5bc0149eee67479c1e58d20a7a02be73" | 16 | SRCREV = "d7e914968c363bea7fd318f758795c950e0a8639" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 660c085f..dc5dddd6 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 = "c9eeabc7a7f83eb5603cedf7336f50e089d025af" | 32 | SRCREV = "961d99bb82f042c410ed826bfd39f8edb5d79bf0" |
33 | 33 | ||
34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
35 | 35 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 88a390f9..d51866ef 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ | |||
106 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 106 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
107 | " | 107 | " |
108 | 108 | ||
109 | SRCREV = "23cc9020b9ed8a39d217d391d052bed62c1ed0cb" | 109 | SRCREV = "4e021d60f9e7493c071e02d45087de0804e2949f" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index c769793d..7eb0b155 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
53 | 53 | ||
54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" |
55 | 55 | ||
56 | SRCREV = "3fd388fe385ba7941a77e6a27c9b1e0e57f07198" | 56 | SRCREV = "e4b82e3a3f91c681df439d5228fa2755134b87ef" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index eef7d726..c7d56d57 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 = "8c5999644c8a98dca74f7339c2c750dd063ae346" | 40 | SRCREV = "44a28bb06d66be1b7ccdc94e36e931002df8d21c" |
41 | 41 | ||
42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 | 42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 |
43 | # 5.9.meta-qt5.6 | 43 | # 5.9.meta-qt5.6 |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 5af90422..9b8fa747 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 = "56a155e68de96a80301ef8b9ad183fcb67e86142" | 15 | SRCREV = "cd32de3a030fb956e6a6e045b084719a5cb2f8dc" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 656ee30f..8c486489 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -164,8 +164,8 @@ SRC_URI_append_libc-musl = "\ | |||
164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
165 | " | 165 | " |
166 | 166 | ||
167 | SRCREV_qtwebengine = "cc526afe9c2cdd4502c90b8f9b505812c984ea08" | 167 | SRCREV_qtwebengine = "ff3de56218e1012e3b0dd056356253b105eb6f2e" |
168 | SRCREV_chromium = "e5175271484644d6101ff3901aaabf2bceb06f28" | 168 | SRCREV_chromium = "13704549b84a86e894d707a97cfe2ad15a86f30c" |
169 | SRCREV = "${SRCREV_qtwebengine}" | 169 | SRCREV = "${SRCREV_qtwebengine}" |
170 | 170 | ||
171 | SRCREV_FORMAT = "qtwebengine_chromium" | 171 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index ccbe4806..af26d7a3 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 = "3dc383a8078d7478a230ca7acac922b373bb9930" | 14 | SRCREV = "df91b5103f4571b9605e4fae50264f101e6931ae" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index f17b94ec..ce573bae 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 = "acc015e1cad69aa1a5224f6a3dcafa79df3a9286" | 22 | SRCREV = "913221453dfbf35d69030819b099c109e078116f" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 2057ca8b..802f7893 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "b51ac2d46ca54769e242702f87bc6762f9f68ea9" | 16 | SRCREV = "34dcc9ea768efc83a299c39a7a4572c66f7eb6a2" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 1e9c9106..97eba835 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -15,6 +15,6 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "4dcae15a5a7f848addfb1b6bc2a98a63dc7218b4" | 18 | SRCREV = "f00a23160e9795615912aa14cf412c7ed278fe50" |
19 | 19 | ||
20 | BBCLASSEXTEND =+ "native nativesdk" | 20 | BBCLASSEXTEND =+ "native nativesdk" |