diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-10-25 13:07:00 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-10-26 11:06:22 +0200 |
commit | 042a096e498bf03ed5924d7afefb0e263fe6356e (patch) | |
tree | 960ff246e4192f0f5532310636d49a85cfeaeb12 | |
parent | 1ec776771f5f09c97917d3839d8140f9a7668c4a (diff) | |
download | meta-qt5-042a096e498bf03ed5924d7afefb0e263fe6356e.tar.gz |
qt5: update submodules
Update submodule SCREVs to Qt 5.6.2 release
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25 files changed, 25 insertions, 70 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ee65b074..bcaa890e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -258,4 +258,4 @@ fakeroot do_generate_qt_environment_file() { | |||
258 | 258 | ||
259 | addtask generate_qt_environment_file after do_install before do_package | 259 | addtask generate_qt_environment_file after do_install before do_package |
260 | 260 | ||
261 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 261 | SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 1b48caf9..7b289dad 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \ | |||
27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67" | 30 | SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 30c534ed..c5795ed5 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -11,4 +11,4 @@ SRC_URI = " \ | |||
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | PV = "5.6.1+git${SRCPV}" | 14 | PV = "5.6.2+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 23fe64ab..efce827a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -117,4 +117,4 @@ do_install() { | |||
117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 117 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
118 | } | 118 | } |
119 | 119 | ||
120 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 120 | SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e532cdd9..963cd495 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -265,4 +265,4 @@ sysroot_stage_dirs_append() { | |||
265 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 265 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
266 | } | 266 | } |
267 | 267 | ||
268 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 268 | SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index c7ec72ab..8025178c 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 = "95884805facd1721eea025467afd85ed64a70504" | 13 | SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 94c331b5..3252411e 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -25,4 +25,4 @@ do_configure_prepend() { | |||
25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 25 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e" | 28 | SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4" |
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch deleted file mode 100644 index d3ee42ef..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Wed, 24 Aug 2016 11:18:37 +1000 | ||
4 | Subject: [PATCH] Workaround crashes in QtQml code related to dead-store | ||
5 | elimination | ||
6 | |||
7 | When compiled in release mode with GCC 6, QtQml may crash. | ||
8 | This is because the C++ compiler is more aggressive about dead-store | ||
9 | elimination in situations where a memory store to a location precedes | ||
10 | the construction of an object at that memory location. | ||
11 | |||
12 | The QV4::MemoryManager::allocate{Managed,Object} functions allocate | ||
13 | memory and write to it before the caller does a placement new to | ||
14 | construct an object in the same memory. The compiler considers these | ||
15 | writes before the constructor as "dead stores" and eliminates them. | ||
16 | |||
17 | The -fno-lifetime-dse compiler flag is added to disable this more | ||
18 | aggressive dead-store eliminiation optimization. | ||
19 | |||
20 | This is a temporary workaround until a proper solution is found. | ||
21 | |||
22 | Upstream-Status: Accepted | ||
23 | |||
24 | Task-number: QTBUG-55482 | ||
25 | Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5 | ||
26 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
27 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
28 | --- | ||
29 | src/qml/qml.pro | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/src/qml/qml.pro b/src/qml/qml.pro | ||
33 | index f4862a1..651afa6 100644 | ||
34 | --- a/src/qml/qml.pro | ||
35 | +++ b/src/qml/qml.pro | ||
36 | @@ -18,7 +18,7 @@ exists("qqml_enable_gcov") { | ||
37 | |||
38 | greaterThan(QT_GCC_MAJOR_VERSION, 5) { | ||
39 | # Our code is bad. Temporary workaround. | ||
40 | - QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks | ||
41 | + QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse | ||
42 | } | ||
43 | |||
44 | QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index aabadc0d..0649ecd6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -16,7 +16,6 @@ DEPENDS += "qtbase" | |||
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-qmltestexample-fix-link.patch \ | 17 | file://0001-qmltestexample-fix-link.patch \ |
18 | file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ | 18 | file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ |
19 | file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" | 21 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" |
@@ -35,6 +34,6 @@ do_configure_prepend() { | |||
35 | 34 | ||
36 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
37 | 36 | ||
38 | SRCREV = "a05f59388e004160899d5d311884cfabe10c3b8c" | 37 | SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6" |
39 | 38 | ||
40 | BBCLASSEXTEND =+ "native nativesdk" | 39 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 37e1f401..e7bce9de 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "99f384ac2353df89a1522e47c96cae6a945749e1" | 31 | SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 59be91fc..80d7699a 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "04762a9eecafc80ebeb90c06258de551d451497f" | 32 | SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 71e78abb..8e3da52d 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -35,4 +35,4 @@ SRC_URI += "\ | |||
35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ | 35 | file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ |
36 | " | 36 | " |
37 | 37 | ||
38 | SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0" | 38 | SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index a2163ffe..6c2d3095 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -26,4 +26,4 @@ do_configure_prepend() { | |||
26 | sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro | 26 | sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro |
27 | } | 27 | } |
28 | 28 | ||
29 | SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19" | 29 | SRCREV = "5eab543c5c955f5057225b9bdb6b2757516dbd3e" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 66ec15e9..32053e45 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative" | |||
12 | 12 | ||
13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" | 13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" |
14 | 14 | ||
15 | SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a" | 15 | SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 42d504e2..aeaa9678 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d" | 20 | SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index e599617c..345c5cb9 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase qtdeclarative" | 15 | DEPENDS += "qtbase qtdeclarative" |
16 | 16 | ||
17 | SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" | 17 | SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 10780bea..fdcba1e3 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 = "133dbd59fb04974149d2140b267fce91a7cfd4a2" | 18 | SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 87854aff..0e7b6697 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "bda7ece99a8162118a91e9f475c149be39846ecd" | 34 | SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 5e11d24f..5995c991 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" | 117 | SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 8fc18623..7c0a514e 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -25,4 +25,4 @@ do_install() { | |||
25 | oe_runmake install INSTALL_ROOT=${D} | 25 | oe_runmake install INSTALL_ROOT=${D} |
26 | } | 26 | } |
27 | 27 | ||
28 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" | 28 | SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 3153dc06..d349cc38 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" | 39 | SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 28b9fe64..8f307aa4 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -119,10 +119,10 @@ SRC_URI += " \ | |||
119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
120 | " | 120 | " |
121 | 121 | ||
122 | SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc" | 122 | SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380" |
123 | # This is in git submodule, but we're using latest in 45-based | 123 | # This is in git submodule, but we're using latest in 45-based |
124 | # SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" | 124 | # SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" |
125 | SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24" | 125 | SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" |
126 | SRCREV = "${SRCREV_qtwebengine}" | 126 | SRCREV = "${SRCREV_qtwebengine}" |
127 | 127 | ||
128 | SRCREV_FORMAT = "qtwebengine_chromium" | 128 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c71850a1..d679994a 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
73 | 73 | ||
74 | SRCREV = "a6c9dd667d534d3342bfba456f9d5c146a924de0" | 74 | SRCREV = "bb43bca1664721401c3a2c25b585913bb5e8cb4f" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 04f762ed..c71a69f3 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 = "e66dcd51d0e5517e88cd59912fd08501522a2902" | 14 | SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index e6962a60..f715f1e7 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8" | 16 | SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |