diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:18 +0200 |
commit | bf2cafa909a27250f853a823e9d7101307337e7a (patch) | |
tree | 3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt | |
parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) |
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
65 files changed, 234 insertions, 237 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4e551413..b66c8a5e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -257,4 +257,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "cec15a89d058424794978910cc8da65b43d71606" +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 a96b06cf..c3a5bc5a 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 = "7a208d76ed96bb506899becfe680df06f95451c7" +SRCREV = "be29a39ede4355a5aa18e93c27a75a1c3f81bde4" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8a6d93e8..8f88b6d4 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,8 +1,8 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> +# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.6" +QT_MODULE_BRANCH ?= "5.7" # each module needs to define valid SRCREV SRC_URI = " \ @@ -11,4 +11,4 @@ SRC_URI = " \ S = "${WORKDIR}/git" -PV = "5.6.0+git${SRCPV}" +PV = "5.6.99+5.7.0-beta+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 73900afe..426e0aeb 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 = "cec15a89d058424794978910cc8da65b43d71606" +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 522afcd1..af85fe9d 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,4 +1,4 @@ -From cabe9683b82493e2547e87ae0057f44f71efe519 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] Add linux-oe-g++ platform @@ -47,19 +47,19 @@ Upstream-Status: Inappropriate [embedded specific] Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - configure | 71 ++++++++++++++++--------- + configure | 55 ++++++++++++------- mkspecs/features/configure.prf | 4 +- mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 4 files changed, 189 insertions(+), 28 deletions(-) + 4 files changed, 181 insertions(+), 20 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 3e97c98..88a308d 100755 +index b65c564..ffe6931 100755 --- a/configure +++ b/configure -@@ -342,6 +342,16 @@ getQMakeConf() +@@ -339,6 +339,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -76,7 +76,7 @@ index 3e97c98..88a308d 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -351,6 +361,16 @@ getXQMakeConf() +@@ -348,6 +358,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -93,7 +93,7 @@ index 3e97c98..88a308d 100755 compilerSupportsFlag() { cat >conftest.cpp <<EOF -@@ -557,24 +577,14 @@ fi +@@ -569,24 +589,14 @@ fi # initalize variables #------------------------------------------------------------------------------- @@ -124,8 +124,8 @@ index 3e97c98..88a308d 100755 fi'` eval "$cmd" done -@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then - [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no +@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then + [ "$CFG_GTK" = "auto" ] && CFG_GTK=no fi -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` @@ -133,16 +133,16 @@ index 3e97c98..88a308d 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then - exit 1 +@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then fi fi + -TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS` +TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS` GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3976,6 +3986,14 @@ setBootstrapVariable() +@@ -3878,6 +3888,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -157,42 +157,19 @@ index 3e97c98..88a308d 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - fi - - [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= -- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" -- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" -- setBootstrapVariable QMAKE_CFLAGS -- setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS -- setBootstrapVariable QMAKE_CXXFLAGS -- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -- setBootstrapVariable QMAKE_LFLAGS -- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS -+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" -+ setBootstrapEvalVariable QMAKE_CFLAGS -+ setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS -+ setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS -+ setBootstrapEvalVariable QMAKE_LFLAGS -+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS - - if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE -@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ - \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" +@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXEEXT= -+ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target - fi + ;; + esac ++ [ "$QT_CROSS_COMPILE" = "yes" ] && EXEEXT=-target if [ "$BUILD_ON_MAC" = "yes" ]; then echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" + echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 6b37a04..dcf6025 100644 +index 92c288c..f3019e0 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -63,12 +63,12 @@ defineTest(qtCompileTest) { +@@ -63,14 +63,14 @@ defineTest(qtCompileTest) { } # Clean up after previous run @@ -201,7 +178,9 @@ index 6b37a04..dcf6025 100644 mkpath($$test_out_dir)|error("Aborting.") - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { + !isEmpty (QMAKE_QTCONF): qtconfarg = -qtconf $$QMAKE_QTCONF + + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qtconfarg -spec $$QMAKESPEC $$qmake_configs $$shell_quote($$test_dir)") { - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { log("yes$$escape_expand(\\n)") diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0b0650d3..54895dfb 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc Mon Sep 17 00:00:00 2001 +From aaa1675d3c9f0d100f596ca4e2ddf3bd25fae5b6 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 8bcacca..e1c87b5 100644 +index 4582001..ff65ef9 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -157,7 +157,10 @@ void QLibrarySettings::load() +@@ -163,7 +163,10 @@ void QLibrarySettings::load() QSettings *QLibraryInfoPrivate::findConfiguration() { diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index ca271e6c..11cd97b0 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,4 +1,4 @@ -From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 +From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option @@ -26,21 +26,23 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> Conflicts: configure + +Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 --- configure | 14 ++++++++++++++ mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 5 +++-- - qtbase.pro | 13 ++++++++++--- + mkspecs/features/qt_tool.prf | 4 +++- + qtbase.pro | 16 ++++++++++++++++ src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 7 files changed, 38 insertions(+), 12 deletions(-) + 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/configure b/configure -index 88a308d..f2611ed 100755 +index ffe6931..5aa87b4 100755 --- a/configure +++ b/configure -@@ -810,6 +810,7 @@ QT_HOST_BINS= +@@ -825,6 +825,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -48,7 +50,7 @@ index 88a308d..f2611ed 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do +@@ -944,6 +945,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -56,7 +58,7 @@ index 88a308d..f2611ed 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do +@@ -1176,6 +1178,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -66,7 +68,7 @@ index 88a308d..f2611ed 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2428,6 +2433,10 @@ Installation options: +@@ -2438,6 +2443,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -77,7 +79,7 @@ index 88a308d..f2611ed 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3172,6 +3181,11 @@ fi +@@ -3196,6 +3205,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -90,10 +92,10 @@ index 88a308d..f2611ed 100755 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 8639695..d89d948 100644 +index cfac583..41ca7f1 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -70,7 +70,11 @@ defineTest(qtHaveModule) { +@@ -71,7 +71,11 @@ defineTest(qtHaveModule) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -104,13 +106,13 @@ index 8639695..d89d948 100644 + else: \ + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) - } else: contains(QMAKE_HOST.os, Windows) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 839c3d6..45934a0 100644 +index bdeb59c..b8c539f 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf -@@ -14,10 +14,11 @@ load(qt_app) +@@ -14,10 +14,12 @@ load(qt_app) CONFIG += console DEFINES *= QT_USE_QSTRINGBUILDER @@ -118,37 +120,37 @@ index 839c3d6..45934a0 100644 + # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. --# Non-bootstrapped tools always need this because of the environment setup. --!build_pass:if(!host_build|!force_bootstrap|force_independent) { -+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty(QT_EXTERNAL_HOST_BINS) { + # Non-bootstrapped tools always need this because of the environment setup. +-!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)):isEmpty(QT_EXTERNAL_HOST_BINS) { isEmpty(MODULE):MODULE = $$TARGET - !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) + load(qt_build_paths) diff --git a/qtbase.pro b/qtbase.pro -index 98ca86a..0eed475 100644 +index 11cff9e..ec03669 100644 --- a/qtbase.pro +++ b/qtbase.pro -@@ -37,12 +37,16 @@ CONFIG -= qt +@@ -38,6 +38,19 @@ CONFIG -= qt ### installations #### +QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] + - #qmake - qmake.path = $$[QT_HOST_BINS] ++#qmake ++qmake.path = $$[QT_HOST_BINS] +qmake.files = $$OUT_PWD/bin/qmake +!isEmpty(QT_EXTERNAL_HOST_BINS) { + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake +} - equals(QMAKE_HOST.os, Windows) { -- qmake.files = $$OUT_PWD/bin/qmake.exe --} else { -- qmake.files = $$OUT_PWD/bin/qmake ++equals(QMAKE_HOST.os, Windows) { + qmake.files = $${qmake.files}.exe - } - INSTALLS += qmake - -@@ -59,6 +63,9 @@ INSTALLS += fixqt4headers ++} ++INSTALLS += qmake ++ + #licheck + licheck.path = $$[QT_HOST_BINS] + licheck.files = $$PWD/bin/$$QT_LICHECK +@@ -51,6 +64,9 @@ INSTALLS += fixqt4headers #syncqt syncqt.path = $$[QT_HOST_BINS] syncqt.files = $$PWD/bin/syncqt.pl @@ -159,7 +161,7 @@ index 98ca86a..0eed475 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 91a4eb6..25df27c 100644 +index a5ed8b2..0e11a1e 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 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 a35b6a2a..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,4 +1,4 @@ -From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 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] qt_module: Fix pkgconfig and libtool replacements @@ -68,7 +68,7 @@ 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 75b84ff..ab36fa6 100644 +index 03ec36a..2ab192b 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { @@ -92,7 +92,7 @@ index 75b84ff..ab36fa6 100644 contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index cc8ed87..b7d4be2 100644 +index c1c668a..67d916d 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { 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 e21b36d3..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,4 +1,4 @@ -From e6ed023b0210375e594b7b61dfb620deb486ee8c 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] configure: bump path length from 256 to 512 characters @@ -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 f2611ed..24a61db 100755 +index 5aa87b4..17bca95 100755 --- a/configure +++ b/configure -@@ -3930,10 +3930,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 */ 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 b6758052..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,4 +1,4 @@ -From 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 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] QOpenGLPaintDevice sub-area support @@ -21,10 +21,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index 17a3277..85425da 100644 +index 75f09d6..17d7155 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp -@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) +@@ -141,6 +141,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) { } @@ -37,7 +37,7 @@ index 17a3277..85425da 100644 /*! \internal */ -@@ -216,6 +222,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const +@@ -222,6 +228,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const return d_ptr->ctx; } @@ -50,10 +50,10 @@ index 17a3277..85425da 100644 Returns the pixel size of the paint device. diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index 804e485..88b481a 100644 +index dffa68c..66a1e3d 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h -@@ -53,12 +53,14 @@ public: +@@ -59,12 +59,14 @@ public: QOpenGLPaintDevice(); explicit QOpenGLPaintDevice(const QSize &size); QOpenGLPaintDevice(int width, int height); @@ -69,10 +69,10 @@ index 804e485..88b481a 100644 void setSize(const QSize &size); void setDevicePixelRatio(qreal devicePixelRatio); diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h -index 54ea092..f660143 100644 +index 78e6b7a..6630461 100644 --- a/src/gui/opengl/qopenglpaintdevice_p.h +++ b/src/gui/opengl/qopenglpaintdevice_p.h -@@ -65,6 +65,7 @@ public: +@@ -71,6 +71,7 @@ public: public: QSize size; @@ -81,10 +81,10 @@ index 54ea092..f660143 100644 qreal dpmx; diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 0b92bf4..f41e059 100644 +index d93871c..be2bee9 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -2078,7 +2078,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2084,7 +2084,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -95,7 +95,7 @@ index 0b92bf4..f41e059 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2165,7 +2168,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2171,7 +2174,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -104,7 +104,7 @@ index 0b92bf4..f41e059 100644 d->needsSync = false; d->shaderManager->setDirty(); d->syncGlState(); -@@ -2207,6 +2210,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2213,6 +2216,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { funcs.glDisable(GL_SCISSOR_TEST); } else { @@ -112,7 +112,7 @@ index 0b92bf4..f41e059 100644 funcs.glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2215,12 +2219,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2221,12 +2225,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -128,10 +128,10 @@ index 0b92bf4..f41e059 100644 funcs.glScissor(left, bottom, width, height); diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index f1ec669..6d302b8 100644 +index c9f3282..7c0616b 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: +@@ -270,6 +270,7 @@ public: QOpenGL2PaintEngineEx* q; QOpenGLEngineShaderManager* shaderManager; QOpenGLPaintDevice* device; @@ -140,10 +140,10 @@ index f1ec669..6d302b8 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index c179143..fad68d5 100644 +index 8f69095..cf82ee7 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) +@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { 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 2fab8884..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,4 +1,4 @@ -From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae 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] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T 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 7ca19133..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,4 +1,4 @@ -From b5c826a39760519010884547d6981c3af031d9c8 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] configure paths for target qmake properly @@ -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 24a61db..2e99d39 100755 +index 17bca95..6abdd6b 100755 --- a/configure +++ b/configure -@@ -3875,8 +3875,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 24a61db..2e99d39 100755 QT_CONFIGURE_STR_OFF=0 -@@ -3909,7 +3914,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 24a61db..2e99d39 100755 addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" -@@ -3921,6 +3930,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 24a61db..2e99d39 100755 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* License Info */ static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; -@@ -3933,7 +3948,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"; diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index 230c966d..bee10d55 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 49b2100ff86ab5b4977608903b30cb71075592c6 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] Always build uic @@ -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 diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch index 5bb73e75..949b323f 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch @@ -1,4 +1,4 @@ -From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a Mon Sep 17 00:00:00 2001 +From 6df8d620081bd78319fc97846e52b1a83042401a Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option for native(sdk) @@ -37,10 +37,10 @@ Conflicts: 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 2e99d39..a0641d2 100755 +index 6abdd6b..7c5a066 100755 --- a/configure +++ b/configure -@@ -3922,6 +3922,7 @@ fi +@@ -3824,6 +3824,7 @@ fi addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" @@ -49,10 +49,10 @@ index 2e99d39..a0641d2 100755 addConfStr "$shortspec" diff --git a/qmake/property.cpp b/qmake/property.cpp -index 817ae95..c69539f 100644 +index 9ee08f4..e6ecf92 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp -@@ -68,6 +68,7 @@ static const struct { +@@ -63,6 +63,7 @@ static const struct { { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, @@ -61,10 +61,10 @@ index 817ae95..c69539f 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index e1c87b5..d6e03ba 100644 +index ff65ef9..3726831 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() +@@ -381,7 +381,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -73,7 +73,7 @@ index e1c87b5..d6e03ba 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -398,6 +398,7 @@ static const struct { +@@ -406,6 +406,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." }, @@ -82,10 +82,10 @@ index e1c87b5..d6e03ba 100644 { "HostSpec", "" }, { "HostPrefix", "" }, diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 1ad7637..5a8b127 100644 +index 362d47d..a2326e2 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h -@@ -81,6 +81,7 @@ public: +@@ -87,6 +87,7 @@ public: HostBinariesPath, HostLibrariesPath, HostDataPath, @@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644 HostSpecPath, HostPrefixPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 6f1e2b7..ae03143 100644 +index 7fd0b98..47fa6c3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1256,6 +1256,13 @@ void Configure::parseCmdLine() +@@ -1202,6 +1202,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } @@ -111,7 +111,7 @@ index 6f1e2b7..ae03143 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp() +@@ -4121,6 +4128,9 @@ void Configure::generateQConfigCpp() if (dictionary["QT_REL_HOST_DATA"].isEmpty()) dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; @@ -121,7 +121,7 @@ index 6f1e2b7..ae03143 100644 confStringOff = 0; addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); -@@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp() +@@ -4140,6 +4150,7 @@ void Configure::generateQConfigCpp() addConfStr(1, dictionary["QT_REL_HOST_BINS"]); addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); addConfStr(1, dictionary["QT_REL_HOST_DATA"]); diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index b85c5632..051ec89d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -261,4 +261,4 @@ sysroot_stage_dirs_append() { rm -rf $to${OE_QMAKE_PATH_QT_FONTS} } -SRCREV = "cec15a89d058424794978910cc8da65b43d71606" +SRCREV = "84330007e12122bf1b690a4e68b5ef8e973c7882" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 5b12d1a7..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 = "791ddce7d41b126ba4744a6701597f49dbf99f3b" +SRCREV = "32404e27101c5ec81b4ab965faf38263429bbc5a" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 03990d85..b84ad040 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 = "dedff12a896d51c469d2af82664b86a10f8fa7fe" +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 ee568200..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 d26a676827ef2d64b4627090690d3240e62f6565 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 @@ -15,12 +15,11 @@ Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450 Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - examples/qmltest/qmltest/qmltest.pro | 2 +- - tests/auto/qml/qjsengine/qjsengine.pro | 2 +- - tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- - tests/auto/qmltest/qmltest.pro | 1 + - tools/qmltestrunner/qmltestrunner.pro | 2 +- - 5 files changed, 5 insertions(+), 4 deletions(-) + examples/qmltest/qmltest/qmltest.pro | 2 +- + tests/auto/qml/qjsengine/qjsengine.pro | 2 +- + tests/auto/qmltest/qmltest.pro | 1 + + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index b5893c5..1b00e6c 100644 @@ -36,31 +35,19 @@ index b5893c5..1b00e6c 100644 macx: CONFIG -= app_bundle diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro -index fc2452c..919710f 100644 +index c9d78e2..5861613 100644 --- a/tests/auto/qml/qjsengine/qjsengine.pro +++ b/tests/auto/qml/qjsengine/qjsengine.pro -@@ -1,7 +1,7 @@ +@@ -1,6 +1,6 @@ CONFIG += testcase - CONFIG += parallel_test TARGET = tst_qjsengine -QT += qml qml-private widgets testlib gui-private +QT += qml qml-private widgets testlib gui-private quick macx:CONFIG -= app_bundle SOURCES += tst_qjsengine.cpp RESOURCES += qjsengine.qrc -diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro -index c6d442e..3181dcd 100644 ---- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro -+++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro -@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle - - TESTDATA = data/* - --QT += core-private qml-private testlib gui gui-private -+QT += core-private qml-private testlib gui gui-private quick - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro -index 7662cb1..a8f8ae2 100644 +index 54db7a7..8c6986c 100644 --- a/tests/auto/qmltest/qmltest.pro +++ b/tests/auto/qmltest/qmltest.pro @@ -4,6 +4,7 @@ CONFIG += qmltestcase 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 index 60c9685f..dc707abf 100644 --- 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 @@ -1,4 +1,4 @@ -From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001 +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 diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 72b3d7be..5e966330 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" +SRCREV = "31ef2e858c2a0835c040b3199c9557f0f6c66808" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 04f5a79d..d5e8dfa4 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" -SRCREV = "cf717b99fdb1b7221dd556bf3be32feba0ed8afe" +SRCREV = "0f6e294fb8534f677a5ec75113679cfe24f559c1" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 606b873a..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 = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" +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 12118980..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 c4c008c46291be290312b5674af1c1b9c446fa8e 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 diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 573b3303..6c983c24 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 = "bf5b49878d75d316f31225f76152e8381a3d5f0f" +SRCREV = "42b07b2ddf443d3eafd18e169f2e5ab5e36604a5" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8a41551b..ce240c52 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 = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" +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 05f54732..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 98455d75df7b040817e323417b6042118c093d56 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. diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 328fdd74..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 = "2170a3b0fcda613daf76a337fa45cb97e0714cdf" +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 61b02a17..e34cc227 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -7,7 +7,7 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ @@ -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" @@ -23,4 +25,4 @@ do_configure_prepend() { sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro } -SRCREV = "563ce3888f3c04abcc96ba236b20c7a822bc88e2" +SRCREV = "5e3bd5cb28e7af95b289a617ca2f7a8892498225" 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 index c57943d9..ad2b489d 100644 --- 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 @@ -1,4 +1,4 @@ -From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001 +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' @@ -11,10 +11,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 1 insertion(+) diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp -index 2e03f74..3d1b3c8 100644 +index bdecf5b..811a761 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.cpp +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp -@@ -44,6 +44,7 @@ +@@ -54,6 +54,7 @@ #include <QtGui/QTextCursor> #include <QtGui/QFontDatabase> #include <QtCore/QFileInfo> diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 0ebf4fd5..00fe4fc9 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0" +SRCREV = "2a5c64a1ddf5b6fdb9104faf99260925a327b2f4" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7a5ca233..9231a79c 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 = "01e52200e2a76ec51c3bb9710617ac0c249a78bc" +SRCREV = "3411c3579fb9e767c819c0c8d9f35c52c9964b06" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 565ca843..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 = "b16873afea798d08799d7a0b255b8d200337f35b" +SRCREV = "b49bfdaad11be1de632f907d43485a7ac701ddc5" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 16c20956..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 = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" +SRCREV = "33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4139db1f..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 = "9a70ee2389d3302f6a4262325f8a76e4d867b478" +SRCREV = "84feab670cce8414ad54f4d19b46291c7fdb14cf" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 6c300e5b..09fef6ca 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a" +SRCREV = "612c3041475550837dee7149b9f5e9e4f55c17a0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 8cbe0e0c..a467f998 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -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 = "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 dbb94381..8cf6adae 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,4 +1,4 @@ -From c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 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] Allow to build only lrelease + lupdate + lconvert 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 b5e92934..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 34f23c43f1c656ccd424528821a9ac65a98c5fec 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 diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index f0f40b7a..aca2fbce 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From b77f225e25360832074692681c5ff7c13862102d 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] add noqtwebkit configuration 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 16ff71e4..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,4 +1,4 @@ -From e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f 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] linguist-tools cmake: allow overriding the location for diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e0b23b4b..fbc5a38a 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 = "e33532e048fa12ee32429ca83ee31aa8f065147d" +SRCREV = "d36d2c3026cae67c119384f47cb2680552c81aaf" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 93b147d8..70f57bf8 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 = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f" +SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index ca47da84..505f19b1 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 = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" +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 45493cf5..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 cadcacf58301251629a63ecd2682d58e6bf24cb8 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 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 f39707c6..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 52971db84e3b2c429e8777953c0532dcb88b8e6b 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 @@ -14,15 +14,14 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro -index d633fb9..643c7cd 100644 +index b67d12e..c5daad0 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro -@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { - SUBDIRS += qml-compositor - } - -- SUBDIRS += server-buffer -+ contains(QT_CONFIG, opengles2) { -+ SUBDIRS += server-buffer -+ } +@@ -9,4 +9,6 @@ qtHaveModule(quick) { + SUBDIRS += custom-extension } + +-SUBDIRS += server-buffer ++contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++} diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a1cee864..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 = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" +SRCREV = "bfa66ccb29f747e2cb07a4f2e561b165be9f211d" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 79c6b23f..869851b1 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" +SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9" 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 75350c17..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,4 +1,4 @@ -From 04be78d20ecc23e289e171e907bb5daf9393619d 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] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc @@ -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 b860735..0ed5de3 100644 +index 63c3f76..331c975 100644 --- a/src/3rdparty/chromium/base/base.gypi +++ b/src/3rdparty/chromium/base/base.gypi -@@ -785,7 +785,7 @@ +@@ -801,7 +801,7 @@ ['include', '^nix/'], ], }], 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 c95fad09..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,4 +1,4 @@ -From dde0edc1681bb49580584028c2d7b5757e177cd1 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] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H @@ -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 2df689b..8d984c7 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})): \ 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 00432bc0..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,4 +1,4 @@ -From 3ae00f0217e4a0039f0855ea6cd945209b1734ee 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] chromium: Change false to FALSE and 1 to TRUE, FIX 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 18f268ce..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,4 +1,4 @@ -From 6576e3135b839b53c422befac0a233f6dd1966bf 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] functions.prf: Make sure we only use the file name to @@ -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 8d984c7..055e960 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) { 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 78cb3fc4..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,4 +1,4 @@ -From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f 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] functions.prf: allow build for linux-oe-g++ platform @@ -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 055e960..379c9b5 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) { 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 901462cd..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,4 +1,4 @@ -From a2670f5ad67822b399e9dd7b3b87589be1da9749 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] WebEngine qquickwebengineview_p_p.h add include QColor @@ -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 65bf25e..0447d07 100644 +index 892e99c..a4429d5 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -56,6 +56,8 @@ +@@ -60,6 +60,8 @@ #include <QString> #include <QtCore/qcompilerdetection.h> #include <QtGui/qaccessibleobject.h> 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 fa3faf45..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,4 +1,4 @@ -From b523c4dd76f6205389d8f5771124f0451ec7183f 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] Include dependency to QCoreApplication::translate() @@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 1 file changed, 2 insertions(+) diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index 500fe76..eda2824 100644 +index b13a9da..8a54cce 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h -@@ -43,6 +43,8 @@ +@@ -46,6 +46,8 @@ #include <map> #include <QtCore/qcompilerdetection.h> diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 427cd958..48c955cc 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -1,12 +1,15 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt" -LICENSE = "LGPL-3.0 & BSD" +# Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ +LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0" LIC_FILES_CHKSUM = " \ - file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ - file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ - file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ + file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ + file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ + file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \ file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " DEPENDS += " \ @@ -106,7 +109,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "45-based" +QT_MODULE_BRANCH_CHROMIUM = "49-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ @@ -119,8 +122,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480" -SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" +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 933220de..0920f260 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" +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 1f3dd2a7..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,4 +1,4 @@ -From 3e321803386278c52508d114f5096883e974a4bb Mon Sep 17 00:00:00 2001 +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] qtwebkit: fix QA issue (bad RPATH) 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 2114b42c..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,4 +1,4 @@ -From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 +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] Remove TEXTREL tag in x86 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 5edc9392..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,4 +1,4 @@ -From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001 +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] Exclude backtrace() API for non-glibc libraries diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index eb05ce24..22efe82b 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 = "71136c9621103522e85654c8e144d5f1c961de1c" +SRCREV = "2e8517924b70a778463e463873eb3d8d0b623eed" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 66d9d741..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 = "ba9306ec5a1271275d79b2f48ceb227f79352f33" +SRCREV = "00156d63eea2fb7681a8a00a3144392d6325e5cb" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d8beb500..e4228177 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4" +SRCREV = "b414120c60ef8c3cc2aad7dca41092647d741a36" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d78df146..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 = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8" +SRCREV = "fb1dc19bf195c530b7f44d18cc927472b9866a46" BBCLASSEXTEND =+ "native nativesdk" |