diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-09 14:15:18 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-09 16:12:26 +0300 |
| commit | 5bd17acd072dd168bf1ecadde9cd2b9641c08c6c (patch) | |
| tree | 78f015a9a9060dbe4778001e3b0e50dc30900276 | |
| parent | e6897ccd0eec8fb5229e0fdd8f354292e0f49a16 (diff) | |
| parent | 0e5756c97ace089ddd9714f0eafffd71dd15c6ab (diff) | |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig
qtbase: remove fonts packages
qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle
qt5: upgrade to latest revisions in 5.7 branches
qt5: add one more subfolder for ${PN}-qmldesigner
replace base_contains by bb.utils.contains
qt5: upgrade to latest revision in 5.6 branch
qt5: set SRCREVs,PVs to 5.6.0
qtquickcontrols: fix compilation of examples/texteditor
qtdeclarative: fix compilation of examples/qquickviewcomparison
quazip: update to 0.7.2
qtquickcontrols2: initial add 5.6.0
qmake5_base: use remove-libtool bbclass
recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF
qtwebengine: enable ARMv7VE support
Add .gitignore to ignore .pyc/.pyo files
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7
63 files changed, 250 insertions, 269 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index eb070a0a..d50203ed 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -171,7 +171,6 @@ qmake5_base_do_configure () { qmake5_base_native_do_install() { oe_runmake install INSTALL_ROOT=${D} - find "${D}" -ignore_readdir_race -name "*.la" -delete } qmake5_base_fix_install() { @@ -196,7 +195,6 @@ qmake5_base_do_install() { find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE},(INSTALL_ROOT),g" oe_runmake install INSTALL_ROOT=${D} - find "${D}" -ignore_readdir_race -name "*.la" -delete # everything except HostData and HostBinaries is prefixed with sysroot value, # but we cannot remove sysroot override, because that's useful for pkg-config etc diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index eb8a7409..c26a7079 100644 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -12,11 +12,11 @@ USE_RUBY = " \ qtquick1-dev \ qtquick1-mkspecs \ qtquick1-plugins \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \ qttranslations-qtquick1 \ qtwebkit-dev \ qtwebkit-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \ " # Requires Wayland to work @@ -36,9 +36,9 @@ USE_X11 = " \ RDEPENDS_${PN} += " \ packagegroup-core-standalone-sdk-target \ libsqlite3-dev \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \ qtbase-dev \ qtbase-mkspecs \ qtbase-plugins \ @@ -49,30 +49,30 @@ RDEPENDS_${PN} += " \ qttranslations-qthelp \ qtconnectivity-dev \ qtconnectivity-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \ qttranslations-qtconnectivity \ qtdeclarative-dev \ qtdeclarative-mkspecs \ qtdeclarative-plugins \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \ qtdeclarative-staticdev \ qttranslations-qmlviewer \ qttranslations-qtdeclarative \ qtenginio-dev \ qtenginio-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \ qtimageformats-dev \ qtimageformats-plugins \ qtlocation-dev \ qtlocation-mkspecs \ qtlocation-plugins \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \ qttranslations-qtlocation \ qtmultimedia-dev \ qtmultimedia-mkspecs \ qtmultimedia-plugins \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \ qttranslations-qtmultimedia \ qtscript-dev \ qtscript-mkspecs \ @@ -80,7 +80,7 @@ RDEPENDS_${PN} += " \ qtsensors-dev \ qtsensors-mkspecs \ qtsensors-plugins \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ qtserialport-dev \ qtserialport-mkspecs \ qtsvg-dev \ @@ -88,21 +88,21 @@ RDEPENDS_${PN} += " \ qtsvg-plugins \ qtsystems-dev \ qtsystems-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \ qttools-dev \ qttools-mkspecs \ qttools-staticdev \ qttools-tools \ - ${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ ${USE_RUBY} \ - ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ qtwebsockets-dev \ qtwebsockets-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \ qttranslations-qtwebsockets \ qtwebchannel-dev \ qtwebchannel-mkspecs \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \ qtxmlpatterns-dev \ qtxmlpatterns-mkspecs \ qttranslations-qtxmlpatterns \ diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 8cf21f62..61878d5e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -81,7 +81,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ - ${EXTRA_CONF_PACKAGECONFIG} \ + ${PACKAGECONFIG_CONFARGS} \ " # qtbase is exception, as these are used as install path for sysroots @@ -190,7 +190,7 @@ do_configure() { -xplatform ${OE_QMAKE_PLATFORM} \ ${QT_CONFIG_FLAGS} - ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_QTCONF} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" + ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_QTCONF} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" } do_install() { @@ -240,4 +240,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" +SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index c9d22231..8d69ca36 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 +From 16a6bfc8f93f8d4e0d4a6e09cdfb0c4a8412e38f Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -8,7 +8,7 @@ Subject: [PATCH] Allow a tools-only build 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt3d.pro b/qt3d.pro -index a26e76d..263e3c4 100644 +index a26e76d..016fb30 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ @@ -26,6 +26,3 @@ index a26e76d..263e3c4 100644 + sub_tools.depends -= sub_src + SUBDIRS = sub_tools +} --- -1.9.1 - diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 03835310..c3a5bc5a 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -20,13 +20,13 @@ PACKAGECONFIG_class-native ??= "tools-only" PACKAGECONFIG_class-nativesdk ??= "tools-only" PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" -EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/*/*/*.bez \ ${OE_QMAKE_PATH_QML}/*/*/*.obj \ " -SRCREV = "a21a4e0391b81307d96364db7af3b8bd343d773f" +SRCREV = "be29a39ede4355a5aa18e93c27a75a1c3f81bde4" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index bceddf54..8f88b6d4 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.99+5.7.0-alpha+git${SRCPV}" +PV = "5.6.99+5.7.0-beta+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 85d7d892..b066dded 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -6,7 +6,7 @@ inherit qmake5 PACKAGECONFIG_OPENSSL ?= "openssl" PACKAGECONFIG[examples] = "" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" @@ -92,6 +92,7 @@ FILES_${PN}-plugins-dbg = " \ FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/designer \ ${OE_QMAKE_PATH_QML}/*/*/designer \ + ${OE_QMAKE_PATH_QML}/*/*/*/designer \ " # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 397369e1..899698ef 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -36,7 +36,7 @@ do_generate_qt_config_file() { : } -EXTRA_CONF_PACKAGECONFIG = " \ +PACKAGECONFIG_CONFARGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ -system-zlib \ @@ -88,8 +88,8 @@ export OE_QMAKE_AR export OE_QMAKE_STRIP do_configure_prepend() { - MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${EXTRA_CONF_PACKAGECONFIG} || die "Configuring qt failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" - bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_CONF_PACKAGECONFIG was ${EXTRA_CONF_PACKAGECONFIG}" + MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" } do_install() { @@ -115,4 +115,4 @@ do_install() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" +SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 284e0226..04e8739c 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 516355ecd8ee54a8960c87c5f044b069221fa815 Mon Sep 17 00:00:00 2001 +From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/10] Add linux-oe-g++ platform +Subject: [PATCH] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 69d0a08..a53638a 100755 +index b65c564..ffe6931 100755 --- a/configure +++ b/configure @@ -339,6 +339,16 @@ getQMakeConf() @@ -120,7 +120,7 @@ index 69d0a08..a53638a 100755 fi'` eval "$cmd" done -@@ -3430,7 +3440,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_GTK" = "auto" ] && CFG_GTK=no fi @@ -129,7 +129,7 @@ index 69d0a08..a53638a 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3481,7 +3491,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then +@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then fi fi @@ -138,7 +138,7 @@ index 69d0a08..a53638a 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3880,6 +3890,14 @@ setBootstrapVariable() +@@ -3878,6 +3888,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -153,7 +153,7 @@ index 69d0a08..a53638a 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3979,6 +3997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXEEXT= ;; esac @@ -336,6 +336,3 @@ index 0000000..dd12003 +#endif + +#endif // QPLATFORMDEFS_H --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 81112b12..b3677eb0 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,7 +1,7 @@ -From 884e27ee424299e2e8270cfa6d9b22fa57243eaf Mon Sep 17 00:00:00 2001 +From ac2f94a42878c1500e1ab6bbbec7834d9e5edfbb Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 4b40451..d486881 100644 +index 03ec36a..2ab192b 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { +@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { QTPLUGIN = $$manualplugs $$autoplugs } @@ -92,7 +92,7 @@ index 4b40451..d486881 100644 contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 0730084..333bb97 100644 +index c1c668a..67d916d 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { @@ -104,6 +104,3 @@ index 0730084..333bb97 100644 } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index a67fe063..404c0686 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch @@ -1,7 +1,7 @@ -From 795d1907fa683a35f8d09cb1a3ba2b3abc269e7e Mon Sep 17 00:00:00 2001 +From d108da324156b9d709c106c1698bd7466cb26f69 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 -Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters +Subject: [PATCH] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long. @@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 440d09d..147d907 100755 +index 5aa87b4..17bca95 100755 --- a/configure +++ b/configure -@@ -3834,10 +3834,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3832,10 +3832,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */ @@ -31,6 +31,3 @@ index 440d09d..147d907 100755 #endif static const short qt_configure_str_offsets[] = { --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index 8a27e697..92ecb133 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From e4750b168337002678650ecf9fefaaa56fce0038 Mon Sep 17 00:00:00 2001 +From 17450df40d6c163c85b66c1cc485317fd6f9a9c9 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <jani.hautakangas@ixonos.com> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support +Subject: [PATCH] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -152,6 +152,3 @@ index 8f69095..cf82ee7 100644 pex->updateClipScissorTest(); } else { if (m_vao.isCreated()) { --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 6e4d920a..4cc8ce6d 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch @@ -1,8 +1,7 @@ -From c9593918f444274c6ea248229277f5b44dbae557 Mon Sep 17 00:00:00 2001 +From edb00662de57d0b6ddb39f80800cf3d20c6c07fd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 8 Jun 2015 13:59:25 -0700 -Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining - QT_SOCKLEN_T +Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T This helps to make sure that QT_SOCKLEN_T is defined to be 'int' only when its glibc < 2 and not also for the libraries which may define @@ -31,6 +30,3 @@ index dd12003..8623651 100644 #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch index d029e415..106486f3 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch @@ -1,7 +1,7 @@ -From 85beb0cf48cdbe99ec153bceeb964431560182e6 Mon Sep 17 00:00:00 2001 +From e1bc7a14ae9e433112006b1b6944f8b0e3f619ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 13 Nov 2015 12:36:11 +0100 -Subject: [PATCH 08/10] configure paths for target qmake properly +Subject: [PATCH] configure paths for target qmake properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 147d907..a80f3f7 100755 +index 17bca95..6abdd6b 100755 --- a/configure +++ b/configure -@@ -3779,8 +3779,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then +@@ -3777,8 +3777,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi @@ -38,7 +38,7 @@ index 147d907..a80f3f7 100755 QT_CONFIGURE_STR_OFF=0 -@@ -3813,7 +3818,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS +@@ -3811,7 +3816,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS QT_CONFIGURE_STR_OFFSETS= QT_CONFIGURE_STRS= @@ -51,7 +51,7 @@ index 147d907..a80f3f7 100755 addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" -@@ -3825,6 +3834,12 @@ addConfStr "$shortspec" +@@ -3823,6 +3832,12 @@ addConfStr "$shortspec" #------------------------------------------------------------------------------- [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" @@ -64,7 +64,7 @@ index 147d907..a80f3f7 100755 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* License Info */ static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; -@@ -3837,7 +3852,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 +@@ -3835,7 +3850,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; #ifdef QT_BUILD_QMAKE static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; @@ -73,6 +73,3 @@ index 147d907..a80f3f7 100755 #endif static const short qt_configure_str_offsets[] = { --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index 3a1614f5..bee10d55 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch @@ -1,7 +1,7 @@ -From acd673711f3b32e714226ea563d8d7f0afff7251 Mon Sep 17 00:00:00 2001 +From 14b037afc3fa6992733891205a46b44991402afb Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 09/10] Always build uic +Subject: [PATCH] Always build uic Even if we are not building gui or widgets. This tool is needed later as a native tool when compiling the target. @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 1671338..83de483 100644 +index 4a165a2..0f84791 100644 --- a/src/src.pro +++ b/src/src.pro @@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent @@ -26,6 +26,3 @@ index 1671338..83de483 100644 nacl: SUBDIRS -= src_network src_testlib --- -2.7.1 - diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ea261e8c..d984b607 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -33,12 +33,12 @@ RDEPENDS_${PN}-tools += "perl" # PACKAGECONFIG is kept rather minimal for people who don't need # stuff like webkit (and it's easier to add options than remove) -PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" -PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" +PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" +PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" -PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" +PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG_DISTRO ?= "" # Either release or debug, can be overridden in bbappends PACKAGECONFIG_RELEASE ?= "release" @@ -131,7 +131,7 @@ QT_CONFIG_FLAGS += " \ -no-pch \ -no-rpath \ -pkg-config \ - ${EXTRA_CONF_PACKAGECONFIG} \ + ${PACKAGECONFIG_CONFARGS} \ " OE_QMAKE_PATH_HOST_BINS = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}" @@ -205,6 +205,6 @@ do_install_append() { ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri } -RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" +RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" +SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 3f5c074d..a1c8f7fd 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 = "4f4eda51954b7983016e6a062d3db77a68c2ad67" +SRCREV = "32404e27101c5ec81b4ab965faf38263429bbc5a" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2023391b..b84ad040 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -18,11 +18,11 @@ inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" -EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" do_configure_prepend() { # disable bluez test if it isn't enabled by PACKAGECONFIG sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro } -SRCREV = "f8857127320f513e9ec2132bc4af5c470362f37a" +SRCREV = "f8759f683cfc433c432059e1160d2ab657baaec6" diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch index 3d8fd28c..1a8a5f0f 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch @@ -1,4 +1,4 @@ -From 2db2566c3594ed7b86d904fdb29e6f3bad7e9fa0 Mon Sep 17 00:00:00 2001 +From c978b2ed0e1ce48b2d4a4a6eb660927bc88aed57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH] qmltestexample: fix link @@ -70,6 +70,3 @@ index 1bb913e..56f2dd5 100644 CONFIG += no_import_scan load(qt_tool) --- -2.7.1 - diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch new file mode 100644 index 00000000..dc707abf --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch @@ -0,0 +1,25 @@ +From 493e91c9c3527d577f7051de9a582a178ca43fcf Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Thu, 31 Mar 2016 19:38:58 -0400 +Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been + declared error + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h +index 5b86c93..e77514e 100644 +--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h ++++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h +@@ -44,6 +44,7 @@ + #include <QWidget> + #include <QQuickWidget> + #include <QQuickView> ++#include <QCoreApplication> + + QT_FORWARD_DECLARE_CLASS(QRadioButton) + QT_FORWARD_DECLARE_CLASS(QCheckBox) diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a1a4e672..33a0e2d7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -15,6 +15,7 @@ DEPENDS += "qtbase" SRC_URI += " \ file://0001-qmltestexample-fix-link.patch \ + file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ " EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" @@ -36,8 +37,8 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "f5afec250cc63ba3a7b1cc78f51d5eb0031dd478" +SRCREV = "31ef2e858c2a0835c040b3199c9557f0f6c66808" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 93cbcfd1..1ecc4f70 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "f086de0f3a67698b8066576a423298aadf566e13" +SRCREV = "d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b" diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch index af500879..11a97260 100644 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch @@ -1,4 +1,4 @@ -From 7f5d3be2217e13fab5785b60c5ae97680f63b6d9 Mon Sep 17 00:00:00 2001 +From 6f01ba8602a4efdb31bf01bf58aa4cb23552e9ac Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 4 Aug 2014 19:19:05 +0200 Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic @@ -26,6 +26,3 @@ index 8382e5c..63d13ce 100644 +OE_LIBWEBP_ENABLED:qtCompileTest(libwebp) load(qt_parts) --- -2.7.1 - diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bca4e1ca..6c983c24 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -23,9 +23,9 @@ PACKAGECONFIG[libmng] = ",,libmng" PACKAGECONFIG[libtiff] = ",,tiff" PACKAGECONFIG[libwebp] = ",,libwebp" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" +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 = "2d59367241aafbfe6acb30202f64e30697028bd9" +SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 420ee9e4..ce240c52 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -26,7 +26,7 @@ do_configure_prepend() { sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro } -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" +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 = "e176f25daeb3d80af1fd701000fda065064227e1" +SRCREV = "e41c3a9b345536ccee0840ac6f049173aa6a0785" diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch index d6dbc040..81fcd392 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch @@ -1,4 +1,4 @@ -From 95d8cc0b6f90043b0b6bc708cc1e38b1d580ba80 Mon Sep 17 00:00:00 2001 +From df587e2a3bb2aa297088bd3ada4309c4b9a85195 Mon Sep 17 00:00:00 2001 From: Yoann Lopes <yoann.lopes@digia.com> Date: Thu, 31 Oct 2013 15:06:30 +0100 Subject: [PATCH] Initial porting effort to GStreamer 1.0. @@ -54,6 +54,3 @@ index 98bb315..287887f 100644 } qtCompileTest(resourcepolicy) --- -2.7.1 - diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4b76ad6e..5c723376 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 = "0d8366273dcb9af5dae641c7efbc6db878942422" +SRCREV = "c85fd6df07935b9c0fa08f881271cd94ad100003" diff --git a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch new file mode 100644 index 00000000..27a2140c --- /dev/null +++ b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch @@ -0,0 +1,31 @@ +From 450d5dee6cc4f35a7475af507b90ba67327ad724 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 26 Apr 2016 17:48:18 +0200 +Subject: [PATCH] qdeclarativetextinput: update to match QWidgetLineControl API + change + +* setCursorBlinkPeriod was replaced with setBlinkingCursorEnabled & + updateCursorBlinking in qtbase commit: + commit 1b5bc9723c0b23ca5197097c3087df6bbe024a2a + Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> + Date: Tue Apr 19 10:15:54 2016 +0200 + Subject: QWidgetLineControl: respect run-time changes to cursorFlashTime + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp +index 3ff75fd..e39d1af 100644 +--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp ++++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp +@@ -514,7 +514,7 @@ void QDeclarativeTextInput::setCursorVisible(bool on) + if (d->cursorVisible == on) + return; + d->cursorVisible = on; +- d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0); ++ d->control->setBlinkingCursorEnabled(on); + QRect r = d->control->cursorRect(); + if (d->control->inputMask().isEmpty()) + updateRect(r); diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 8b375165..e34cc227 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -16,6 +16,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtscript qtsvg qtxmlpatterns" # qttools +SRC_URI += "file://0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch" + PACKAGECONFIG ??= "webkit" PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit" 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 new file mode 100644 index 00000000..ad2b489d --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch @@ -0,0 +1,24 @@ +From 00bb7694b9287f23d4d059ae134e9409db69673e Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Thu, 31 Mar 2016 19:57:01 -0400 +Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + examples/quick/controls/texteditor/src/documenthandler.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp +index bdecf5b..811a761 100644 +--- a/examples/quick/controls/texteditor/src/documenthandler.cpp ++++ b/examples/quick/controls/texteditor/src/documenthandler.cpp +@@ -54,6 +54,7 @@ + #include <QtGui/QTextCursor> + #include <QtGui/QFontDatabase> + #include <QtCore/QFileInfo> ++#include <QtCore/QDebug> + + DocumentHandler::DocumentHandler() + : m_target(0) diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb new file mode 100644 index 00000000..00fe4fc9 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -0,0 +1,13 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" +LIC_FILES_CHKSUM = " \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ +" + +DEPENDS += "qtdeclarative" + +SRCREV = "2a5c64a1ddf5b6fdb9104faf99260925a327b2f4" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 4221c3da..9231a79c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -13,4 +13,8 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "c24118685d6eb4cacf5f6af96215ba89ecc28604" +SRC_URI += " \ + file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ +" + +SRCREV = "3411c3579fb9e767c819c0c8d9f35c52c9964b06" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index b6499ebb..7859ec53 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "a775b9da4794f1f248b63a4a58ee6ad6885f0622" +SRCREV = "b49bfdaad11be1de632f907d43485a7ac701ddc5" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 82b59f86..1098f25e 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "f8e256271f919c36c8d97eae27b1d11678294e70" +SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 3ff775ed..b16978ba 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 = "f8449352c9af0ee8055c6a85981e092e9d109b9d" +SRCREV = "84feab670cce8414ad54f4d19b46291c7fdb14cf" diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch deleted file mode 100644 index 4ee0994a..00000000 --- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e196a8767dc8886f4d8f411feb21baaf2b8d741a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 5 Nov 2015 12:25:05 +0100 -Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other - examples - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - examples/svg/richtext/textobject/textobject.pro | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro -index 794ad32..0ecd2c7 100644 ---- a/examples/svg/richtext/textobject/textobject.pro -+++ b/examples/svg/richtext/textobject/textobject.pro -@@ -12,6 +12,8 @@ RESOURCES = resources.qrc - target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject - INSTALLS += target - --filesToDeploy.files = files/*.svg --filesToDeploy.path = files --DEPLOYMENT += filesToDeploy -+wince* { -+ filesToDeploy.files = files/*.svg -+ filesToDeploy.path = files -+ DEPLOYMENT += filesToDeploy -+} --- -2.7.1 - diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 3cb23525..09fef6ca 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,6 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "8c23084b207baed7cf58c17e475baa34b889ead2" - -SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" +SRCREV = "612c3041475550837dee7149b9f5e9e4f55c17a0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 943c006c..a467f998 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -16,7 +16,7 @@ inherit bluetooth PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" -EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" do_configure_prepend() { # disable bluez test if it isn't enabled by PACKAGECONFIG @@ -30,7 +30,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 - -SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" +SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 08c86e98..014d572b 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,7 +1,7 @@ -From 412772782e0e4882adb358eabd04fdd2a2166366 Mon Sep 17 00:00:00 2001 +From e80743f15443212823e95d2be82073980a4700bc Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.jansa@gmail.com> Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert +Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native is built without GUI support (no-png is set) and we still want to build @@ -158,6 +158,3 @@ index 20b5fec..8a42d1f 100644 installed_cmake.depends = cmake --- -2.7.1 - diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index 9edc29a5..fe8fe3d7 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch @@ -1,4 +1,4 @@ -From 0f11ccdb0683554595fe7f223071621902c0b315 Mon Sep 17 00:00:00 2001 +From d7943b08bdb858bd2501c93a428ebc13bc9f3cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH] assistant/help: fix linking of dependent libraries @@ -18,16 +18,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 1 file changed, 2 insertions(+) diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro -index 37d5ba4..ca90a68 100644 +index 37d5ba4..8de8763 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro -@@ -59,4 +59,6 @@ HEADERS += qhelpenginecore.h \ - HEADERS += qhelpsearchindexwriter_clucene_p.h \ +@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \ qhelpsearchindexreader_clucene_p.h -+LIBS += -lQt5CLucene -+ load(qt_module) --- -1.9.1 - ++ ++LIBS += -lQt5CLucene diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index d926cd11..aca2fbce 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,7 +1,7 @@ -From a06e526751f430de47e32a39dde16559d3378845 Mon Sep 17 00:00:00 2001 +From 6c5bbd423c3c8f87d00c18384460ab418dccea95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 4 Jun 2014 11:28:16 +0200 -Subject: [PATCH 3/4] add noqtwebkit configuration +Subject: [PATCH] add noqtwebkit configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -46,6 +46,3 @@ index 500a153..b60fa2d 100644 +qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget --- -2.7.1 - diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index 79339b0e..4f599805 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,7 +1,7 @@ -From 7f176e511dfc24bdca2ef2ef7f71afe3177a6ce6 Mon Sep 17 00:00:00 2001 +From 3dfe38ac9b83ee94c8abfe1bb78b14050b0c9a6f Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 9 Jul 2015 11:28:19 -0400 -Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for +Subject: [PATCH] linguist-tools cmake: allow overriding the location for lupdate and lrelease --- @@ -58,6 +58,3 @@ index 4318b16..2e3b70f 100644 _qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lconvert PROPERTIES --- -2.7.1 - diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index c3338228..fbc5a38a 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -28,9 +28,9 @@ PACKAGECONFIG_class-nativesdk ??= "linguistonly" PACKAGECONFIG[linguistonly] = "" PACKAGECONFIG[qtwebkit] = ",,qtwebkit" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" -SRCREV = "f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c" +SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 20ff8d0c..8e9aa2cd 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 = "01daa660d04e8960961988da6191e80c05a84d58" +SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 81d0f926..c199f712 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -1,4 +1,4 @@ -From 08b8b3ab87e5e8d03bf94e7ceb88cc5b22f66b1c Mon Sep 17 00:00:00 2001 +From 4334643f02fc333fa8b633ff614fa4ceecf4a8e6 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side @@ -27,6 +27,3 @@ index ac2d07b..7a46a24 100644 +target.path = $$[QT_HOST_BINS] +INSTALLS += target --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index 48fa206b..72f29534 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -1,4 +1,4 @@ -From 4a74d70a713d34b5b2195506205d79575e8b1427 Mon Sep 17 00:00:00 2001 +From 3c5c13f2f991cc79363969fb3873d553dd985e7b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 22 Feb 2014 17:47:44 +0100 Subject: [PATCH] examples/wayland: include server-buffer only when building @@ -25,6 +25,3 @@ index b67d12e..c5daad0 100644 +contains(QT_CONFIG, opengles2) { + SUBDIRS += server-buffer +} --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 55327516..8f016583 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 = "01daa660d04e8960961988da6191e80c05a84d58" +SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index a6972fca..5fd3f06a 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch @@ -1,8 +1,8 @@ -From aab168c504038c7573f72e082a2431bc0502efd9 Mon Sep 17 00:00:00 2001 +From 66af547c2b3ed473b81421aa239d931d364f644d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH 1/2] <chromium> base.gypi: include - atomicops_internals_x86_gcc.cc when building for x64 arch +Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc + when building for x64 arch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- @@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi -index be4e87c..5434828 100644 +index 63c3f76..331c975 100644 --- a/src/3rdparty/chromium/base/base.gypi +++ b/src/3rdparty/chromium/base/base.gypi -@@ -787,7 +787,7 @@ +@@ -801,7 +801,7 @@ ['include', '^nix/'], ], }], @@ -22,6 +22,3 @@ index be4e87c..5434828 100644 'sources/': [ ['include', 'atomicops_internals_x86_gcc.cc'], ], --- -2.7.0 - diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index 9aa061d0..287bf2b1 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch @@ -1,7 +1,7 @@ -From 33fac625554652e137c9fb095425c25240ee83ae Mon Sep 17 00:00:00 2001 +From d28e6ef9c684a7f8f59995995b5cb5a0b1791ee1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> @@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 2f7cd39..6ae413a 100644 +index 26db26f..277bf98 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -131,9 +131,9 @@ defineReplace(mocOutput) { +@@ -168,9 +168,9 @@ defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one for(ext, $$list($${QMAKE_EXT_CPP})): \ @@ -25,6 +25,3 @@ index 2f7cd39..6ae413a 100644 return($$out) } --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 94eaf86a..d5ed1ab7 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,7 +1,7 @@ -From c3805244c812f4dbfb8949dc2f146aa5c7af62df Mon Sep 17 00:00:00 2001 +From e40a18da9631fa21202836caf69b3343e8bae973 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX +Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX qtwebengine compile Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> @@ -61,6 +61,3 @@ index 8a08fe0..32b2a05 100644 // we want to always get RGB data out switch (cinfo.jpeg_color_space) { --- -2.7.0 - diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 3662c441..38e97d19 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -1,7 +1,7 @@ -From 958e5875c25f76e7431c86286305f289effcedf6 Mon Sep 17 00:00:00 2001 +From 9f314e95248795bcce787f88bce77ba6058b34c7 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to +Subject: [PATCH] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch <morphis@gravedo.de> @@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 6ae413a..deaab83 100644 +index 277bf98..d263be4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { +@@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) { @@ -24,6 +24,3 @@ index 6ae413a..deaab83 100644 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one for(ext, $$list($${QMAKE_EXT_CPP})): \ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index b3f83a39..e0410638 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 4c5dd531c728384326c0875661b77d2f9d0faf19 Mon Sep 17 00:00:00 2001 +From 617028757a9afd334a0938e617429cca78363d69 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <frieder.schrempf@online.de> Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform +Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform Upstream-Status: Inappropriate [OE specific] @@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 6 insertions(+) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index deaab83..68cdb71 100644 +index d263be4..879287a 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { @@ -28,6 +28,3 @@ index deaab83..68cdb71 100644 } else:win32 { winrt { skipBuild("WinRT is not supported.") --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index e4dcbebc..0a708aff 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,7 +1,7 @@ -From 35afd225b448d2641594f2fd7e31c423cc64ecae Mon Sep 17 00:00:00 2001 +From d084661f50dbdc6a4014f9a2181462bba770437f Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Fri, 25 Dec 2015 18:16:05 -0200 -Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor +Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> --- @@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index e4313a4..5a8137e 100644 +index 892e99c..a4429d5 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -59,6 +59,8 @@ +@@ -60,6 +60,8 @@ #include <QString> #include <QtCore/qcompilerdetection.h> #include <QtGui/qaccessibleobject.h> @@ -21,6 +21,3 @@ index e4313a4..5a8137e 100644 namespace QtWebEngineCore { class WebContentsAdapter; --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index dfd8e25c..3a97a4ae 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch @@ -1,7 +1,7 @@ -From 1ad078e7cb9d8fff66f05e828953a2f5b11df7ee Mon Sep 17 00:00:00 2001 +From 0999fbfe32480e737f23ed8fce8f35897b97c20a Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Thu, 24 Dec 2015 15:59:51 -0200 -Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() +Subject: [PATCH] Include dependency to QCoreApplication::translate() Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> --- @@ -21,6 +21,3 @@ index b13a9da..8a54cce 100644 #include "web_contents_adapter_client.h" #include "base/callback.h" --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f1fde794..8fb82220 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -25,7 +25,7 @@ DEPENDS += " \ # qtwebengine will have additional dependencies: # contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst # xscreensaver isn't covered in qtbase DEPENDS -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" DEPENDS += "yasm-native" EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" @@ -43,7 +43,7 @@ PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" -EXTRA_QMAKEVARS_PRE += "${EXTRA_CONF_PACKAGECONFIG}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" @@ -78,7 +78,7 @@ do_configure() { export CC_host="gcc" export CXX_host="g++" export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - export QMAKE_CACHE_EVAL="${EXTRA_CONF_PACKAGECONFIG}" + export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}" # Disable autodetection from sysroot: sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf @@ -122,8 +122,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2" -SRCREV_chromium = "eed57693d22920959d6b7c8f2b1b90b501994760" +SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" +SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 2bc5e9d8..0920f260 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,6 +17,6 @@ PACKAGECONFIG ?= "examples" DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" -RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" +RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" SRCREV = "f3f9e2a1b772b718335331a603a6bee748928e49" diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 8ec65594..d96636e6 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -1,7 +1,7 @@ From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 From: Trevor Woerner <trevor.woerner@linaro.org> Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) +Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) Building qtwebkit causes a QA issue such that QtWebPluginProcess and QtWebProcess contain bad RPATHs which point into the build location. This fix @@ -25,6 +25,3 @@ index fd66af6..ef754c3 100644 CONFIG(debug, debug|release)|force_debug_info { # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch index e659116d..d7627ec2 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch @@ -1,7 +1,7 @@ From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001 From: Magnus Granberg <zorry@gentoo.org> Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH 2/3] Remove TEXTREL tag in x86 +Subject: [PATCH] Remove TEXTREL tag in x86 Fix textrel QA warnings when building qtwebkit for x86: @@ -74,6 +74,3 @@ index 0a2fe78..2dc40ef 100644 #else #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) #endif --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch index 2fcaafb8..a16801b5 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch @@ -1,7 +1,7 @@ From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries +Subject: [PATCH] Exclude backtrace() API for non-glibc libraries It was excluding musl with current checks, so lets make it such that it considers only glibc when using backtrace API @@ -33,6 +33,3 @@ index 1b2091f..ba03a28 100644 *size = backtrace(stack, *size); #elif OS(WINDOWS) && !OS(WINCE) // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.1 - diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 0324c0c3..58b86c8a 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -25,7 +25,7 @@ SRC_URI += "\ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ fontconfig \ " PACKAGECONFIG[gstreamer] = "OE_GSTREAMER_ENABLED,,gstreamer1.0 gstreamer1.0-plugins-base" @@ -40,7 +40,7 @@ PACKAGECONFIG[libxrender] = "OE_LIBXRENDER_ENABLED,,libxrender" PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig" do_configure_prepend() { - export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_CONF_PACKAGECONFIG}" + export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 1b56455b..282ae986 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 = "c6d19a89046763f680d7f67c6f9989b4f51fc71e" +SRCREV = "00156d63eea2fb7681a8a00a3144392d6325e5cb" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d8892ed8..33cedd63 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 = "20e5ddeba66121e59058fbe00896e25b5f82ed44" +SRCREV = "fb1dc19bf195c530b7f44d18cc927472b9866a46" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/quazip/quazip_0.7.1.bb b/recipes-qt/quazip/quazip_0.7.2.bb index 4ba4197e..6b09cf9c 100644 --- a/recipes-qt/quazip/quazip_0.7.1.bb +++ b/recipes-qt/quazip/quazip_0.7.2.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" DEPENDS = "qtbase" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "3b99effb2a9417707d463e6f19cf2629" -SRC_URI[sha256sum] = "78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de" +SRC_URI[md5sum] = "84163487a4c3470781c93e5f56c4ca43" +SRC_URI[sha256sum] = "91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4" inherit qmake5 |