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>
This commit is contained in:
Mikko Gronoff
2016-10-25 13:07:00 +03:00
committed by Martin Jansa
parent 1ec776771f
commit 042a096e49
25 changed files with 25 additions and 70 deletions

View File

@@ -258,4 +258,4 @@ fakeroot do_generate_qt_environment_file() {
addtask generate_qt_environment_file after do_install before do_package
SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"

View File

@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/*/*/*.obj \
"
SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67"
SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -11,4 +11,4 @@ SRC_URI = " \
S = "${WORKDIR}/git"
PV = "5.6.1+git${SRCPV}"
PV = "5.6.2+git${SRCPV}"

View File

@@ -117,4 +117,4 @@ do_install() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"

View File

@@ -265,4 +265,4 @@ sysroot_stage_dirs_append() {
rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
}
SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd"
SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtdeclarative"
SRCREV = "95884805facd1721eea025467afd85ed64a70504"
SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12"

View File

@@ -25,4 +25,4 @@ do_configure_prepend() {
sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
}
SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e"
SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4"

View File

@@ -1,44 +0,0 @@
From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Wed, 24 Aug 2016 11:18:37 +1000
Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
elimination
When compiled in release mode with GCC 6, QtQml may crash.
This is because the C++ compiler is more aggressive about dead-store
elimination in situations where a memory store to a location precedes
the construction of an object at that memory location.
The QV4::MemoryManager::allocate{Managed,Object} functions allocate
memory and write to it before the caller does a placement new to
construct an object in the same memory. The compiler considers these
writes before the constructor as "dead stores" and eliminates them.
The -fno-lifetime-dse compiler flag is added to disable this more
aggressive dead-store eliminiation optimization.
This is a temporary workaround until a proper solution is found.
Upstream-Status: Accepted
Task-number: QTBUG-55482
Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
src/qml/qml.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index f4862a1..651afa6 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
greaterThan(QT_GCC_MAJOR_VERSION, 5) {
# Our code is bad. Temporary workaround.
- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
}
QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf

View File

@@ -16,7 +16,6 @@ DEPENDS += "qtbase"
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
"
EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt"
@@ -35,6 +34,6 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
SRCREV = "a05f59388e004160899d5d311884cfabe10c3b8c"
SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
SRCREV = "99f384ac2353df89a1522e47c96cae6a945749e1"
SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936"

View File

@@ -29,4 +29,4 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
SRCREV = "04762a9eecafc80ebeb90c06258de551d451497f"
SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec"

View File

@@ -35,4 +35,4 @@ SRC_URI += "\
file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
"
SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0"
SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5"

View File

@@ -26,4 +26,4 @@ do_configure_prepend() {
sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
}
SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19"
SRCREV = "5eab543c5c955f5057225b9bdb6b2757516dbd3e"

View File

@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative"
FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a"
SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244"

View File

@@ -17,4 +17,4 @@ SRC_URI += " \
file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
"
SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d"
SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70"

View File

@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf"
SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e"

View File

@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "133dbd59fb04974149d2140b267fce91a7cfd4a2"
SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8"

View File

@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
SRCREV = "bda7ece99a8162118a91e9f475c149be39846ecd"
SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e"
BBCLASSEXTEND = "native nativesdk"

View File

@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
"
SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722"
SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119"

View File

@@ -25,4 +25,4 @@ do_install() {
oe_runmake install INSTALL_ROOT=${D}
}
SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd"
SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"

View File

@@ -36,4 +36,4 @@ SRC_URI += " \
file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
"
SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd"
SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8"

View File

@@ -119,10 +119,10 @@ SRC_URI += " \
file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
"
SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc"
SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380"
# This is in git submodule, but we're using latest in 45-based
# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24"
SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"

View File

@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
SRCREV = "a6c9dd667d534d3342bfba456f9d5c146a924de0"
SRCREV = "bb43bca1664721401c3a2c25b585913bb5e8cb4f"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "e66dcd51d0e5517e88cd59912fd08501522a2902"
SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34"

View File

@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8"
SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92"
BBCLASSEXTEND =+ "native nativesdk"