From 1d7a6b267452d86995ca4019b495abea3049b63d Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 9 Sep 2016 16:12:59 +1000 Subject: qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 ++++++++++++++++++++++ recipes-qt/qt5/qtdeclarative_git.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch 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 new file mode 100644 index 00000000..d3ee42ef --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch @@ -0,0 +1,44 @@ +From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +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 +Signed-off-by: Jonathan Liu +--- + 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 diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 195ec51a..aabadc0d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -16,6 +16,7 @@ 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" -- cgit v1.2.3 From 1ec776771f5f09c97917d3839d8140f9a7668c4a Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 9 Sep 2016 16:13:44 +1000 Subject: qtbase: avoid qmake errors due to missing oe-device-extra.pri An empty oe-extra-extra.pri file is created if it does not exist to suppress qmake errors. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 81e808a2..e532cdd9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -203,6 +203,9 @@ do_configure() { } do_install_append() { + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" + touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri + install -m 0755 ${B}/bin/qmake-target ${D}/${bindir}${QT_DIR_NAME}/qmake ### Fix up the binaries to the right location -- cgit v1.2.3 From 042a096e498bf03ed5924d7afefb0e263fe6356e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 25 Oct 2016 13:07:00 +0300 Subject: qt5: update submodules Update submodule SCREVs to Qt 5.6.2 release Signed-off-by: Mikko Gronoff Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- ...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 ---------------------- recipes-qt/qt5/qtdeclarative_git.bb | 3 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 25 files changed, 25 insertions(+), 70 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch 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() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" +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 += " \ ${OE_QMAKE_PATH_QML}/*/*/*.obj \ " -SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67" +SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" 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 = " \ S = "${WORKDIR}/git" -PV = "5.6.1+git${SRCPV}" +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() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" +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() { rm -rf $to${OE_QMAKE_PATH_QT_FONTS} } -SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" +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 = " \ DEPENDS = "qtdeclarative" -SRCREV = "95884805facd1721eea025467afd85ed64a70504" +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() { sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro } -SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e" +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 @@ -From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -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 -Signed-off-by: Jonathan Liu ---- - 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 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" 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" 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+ 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" 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() { 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" 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 += "\ file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ " -SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0" +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() { sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro } -SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19" +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" FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" -SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a" +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 += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d" +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 = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" +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 = " \ DEPENDS += "qtbase" -SRCREV = "133dbd59fb04974149d2140b267fce91a7cfd4a2" +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" 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" 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 = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" +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() { oe_runmake install INSTALL_ROOT=${D} } -SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" +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 += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ " -SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" +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 += " \ 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" 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 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" 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 = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "e66dcd51d0e5517e88cd59912fd08501522a2902" +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 = " \ DEPENDS += "qtbase" -SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8" +SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3 From 2c89965fb059b1c6dbff1a28285082fccc021112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Sun, 25 Sep 2016 10:54:49 +0300 Subject: qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland. Signed-off-by: Vesa Jääskeläinen Tested-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 +++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 7c0a514e..426bdb2f 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb @@ -15,6 +15,7 @@ DEPENDS = "qtbase-native wayland-native" SRC_URI += " \ file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " do_configure() { diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch new file mode 100644 index 00000000..d173e673 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch @@ -0,0 +1,156 @@ +From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= +Date: Sun, 18 Sep 2016 11:51:59 +0300 +Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are + disabled. + +QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, +QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and +QT_NO_SESSIONMANAGER, these has to be taken into account when compiling +QtWayland. +--- + src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- + src/client/qwaylandintegration_p.h | 12 ++++++++++++ + 2 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 39fff53..481e3d6 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -39,7 +39,9 @@ + #include "qwaylandinputcontext_p.h" + #include "qwaylandshmbackingstore_p.h" + #include "qwaylandnativeinterface_p.h" ++#ifndef QT_NO_CLIPBOARD + #include "qwaylandclipboard_p.h" ++#endif + #include "qwaylanddnd_p.h" + #include "qwaylandwindowmanagerintegration_p.h" + #include "qwaylandscreen_p.h" +@@ -57,7 +59,9 @@ + #include + + #include ++#ifndef QT_NO_ACCESSIBILITY + #include ++#endif + #include + + #include "qwaylandhardwareintegration_p.h" +@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() + , mNativeInterface(new QWaylandNativeInterface(this)) + #ifndef QT_NO_ACCESSIBILITY + , mAccessibility(new QPlatformAccessibility()) +-#else +- , mAccessibility(0) + #endif + , mClientBufferIntegrationInitialized(false) + , mServerBufferIntegrationInitialized(false) +@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration() + { + initializeInputDeviceIntegration(); + mDisplay = new QWaylandDisplay(this); ++#ifndef QT_NO_CLIPBOARD + mClipboard = new QWaylandClipboard(mDisplay); ++#endif ++#ifndef QT_NO_DRAGANDDROP + mDrag = new QWaylandDrag(mDisplay); +- ++#endif + QString icStr = QPlatformInputContextFactory::requested(); + icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay)) + : mInputContext.reset(QPlatformInputContextFactory::create(icStr)); +@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() + + QWaylandIntegration::~QWaylandIntegration() + { ++#ifndef QT_NO_DRAGANDDROP + delete mDrag; ++#endif ++#ifndef QT_NO_CLIPBOARD + delete mClipboard; ++#endif + #ifndef QT_NO_ACCESSIBILITY + delete mAccessibility; + #endif +@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const + return mFontDb; + } + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *QWaylandIntegration::clipboard() const + { + return mClipboard; + } ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *QWaylandIntegration::drag() const + { + return mDrag; + } ++#endif + + QPlatformInputContext *QWaylandIntegration::inputContext() const + { +@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const + return QPlatformIntegration::styleHint(hint); + } + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *QWaylandIntegration::accessibility() const + { + return mAccessibility; + } ++#endif + + QPlatformServices *QWaylandIntegration::services() const + { +diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h +index 987d805..b50ad95 100644 +--- a/src/client/qwaylandintegration_p.h ++++ b/src/client/qwaylandintegration_p.h +@@ -80,15 +80,21 @@ public: + + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; ++#endif + ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *drag() const Q_DECL_OVERRIDE; ++#endif + + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; ++#endif + + QPlatformServices *services() const Q_DECL_OVERRIDE; + +@@ -117,12 +123,18 @@ private: + void initializeInputDeviceIntegration(); + + QPlatformFontDatabase *mFontDb; ++#ifndef QT_NO_CLIPBOARD + QPlatformClipboard *mClipboard; ++#endif ++#ifndef QT_NO_DRAGANDDROP + QPlatformDrag *mDrag; ++#endif + QWaylandDisplay *mDisplay; + QPlatformNativeInterface *mNativeInterface; + QScopedPointer mInputContext; ++#ifndef QT_NO_ACCESSIBILITY + QPlatformAccessibility *mAccessibility; ++#endif + bool mClientBufferIntegrationInitialized; + bool mServerBufferIntegrationInitialized; + bool mShellIntegrationInitialized; +-- +2.7.4 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index d349cc38..6c15b69f 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -34,6 +34,7 @@ FILES_${PN}-plugins-dbg += " \ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ + file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ " SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" -- cgit v1.2.3 From ad1d1b2a9b60795853660cd37708dc47150633b5 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 21 Sep 2016 15:31:38 -0300 Subject: qtwebengine: Add gperf-native to DEPENDS Fix error: FAILED: cd ../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-gnueabi/qtwebengine/ 5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/src/3rdparty/chromium/ third_party/WebKit/Source/platform; gperf "--key-positions=*" -D -s 2 ColorData.gperf "--output-file=../build/tmp/work/cortexa9hf-neon-mx6qdl-linux- gnueabi/qtwebengine/5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/ src/core/Release/gen/blink/platform/ColorData.cpp" /bin/sh: gperf: command not found ninja: build stopped: subcommand failedP Change-Id: Ic28d0ac72fcbce8054638a3168b5d6a34bc129b5 Signed-off-by: Fabio Berton Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8f307aa4..109b7c87 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -16,6 +16,7 @@ DEPENDS += " \ qtlocation \ libdrm fontconfig pixman openssl pango cairo icu pciutils \ libcap \ + gperf-native \ " # when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES), -- cgit v1.2.3 From 2b1871f0d139dc3caaa779a32a1931409c245a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Sat, 29 Oct 2016 16:24:55 +0300 Subject: Update Qt5's git repositories to match new locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt5's repositories in github has changed locations. Qt5 itself and most of its modules are now under: github.com/qt Where as qt5-everywhere-demo is under: github.com/qt-labs Signed-off-by: Vesa Jääskeläinen Signed-off-by: Martin Jansa --- conf/layer.conf | 3 ++- recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index b7207e63..b2a4fbc3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -27,5 +27,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" -QT_GIT ?= "git://github.com/qtproject" +QT_GIT ?= "git://github.com/qt" +QT_LABS_GIT ?= "git://github.com/qt-labs" QT_GIT_PROTOCOL ?= "git" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index ab2bbd4a..7735d902 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b" DEPENDS = "qtdeclarative qtgraphicaleffects" SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" -SRC_URI = "${QT_GIT}/qt-labs-qt5-everywhere-demo" +SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" -- cgit v1.2.3 From ac0d613302db8f7f013bbb0c72b30cdea4bb72c3 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Wed, 25 Jan 2017 13:26:13 +0100 Subject: cmake_qt5.bbclass: add qtbase-native to DEPENDS When building with recipe-specific-sysroot's, qmake can't be found: | CMake Error at WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:32 (message): | The imported target Qt5::Core references the file | | WORKDIR/recipe-sysroot-native/usr/bin/qt5/qmake | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake | | but not all the files it references. | | Call Stack (most recent call first): | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:163 (include) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:31 (find_package) | CMakeLists.txt:56 (find_package) | This is solved by adding qtbase-native to the exported DEPENDS. Signed-off-by: Anders Darander Signed-off-by: Martin Jansa --- classes/cmake_qt5.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 3180fd6d..5d605a68 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -1,7 +1,7 @@ inherit cmake inherit qmake5_paths -DEPENDS_prepend = "qtbase " +DEPENDS_prepend = "qtbase qtbase-native " EXTRA_OECMAKE_prepend = " \ -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ -- cgit v1.2.3 From 1100037b9becaaa5749602bca9d63693119c4585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gordan=20Marku=C5=A1?= Date: Thu, 26 Jan 2017 11:18:35 +0100 Subject: qtwebkit: depends on gperf-native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gordan Markuš Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index d679994a..3d2dbdf8 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ " -DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt" +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native" # qemuarm build fails with: # | {standard input}: Assembler messages: -- cgit v1.2.3