From 46817620916ed6d8b8f07c720f29d1faa73eafae Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 11 Apr 2016 09:45:32 +0300 Subject: qt5: update submodules Change-Id: I984a2f3d412f4d36c79fda1f08662bffda266649 Reviewed-by: David Schulz --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- ...onfigure-Separate-host-and-build-platform.patch | 49 +++++++++++----------- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- ...pro-use-DEPLOYMENT-only-for-wince-like-ot.patch | 30 ------------- recipes-qt/qt5/qtsvg_git.bb | 4 +- ...t-help-fix-linking-of-dependent-libraries.patch | 13 +++--- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 31 files changed, 61 insertions(+), 91 deletions(-) delete mode 100644 recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2197c732..ef2de88b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -239,4 +239,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a19422b6..2b889430 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 = "9b9f34701f47824e8201453d148152fb0855f98a" +SRCREV = "9c67288ea4791fee5e28d1b4f2981c232b95c9d0" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 46a1f548..e1c7fb70 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -115,4 +115,4 @@ do_install() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch index bfe1ba8b..0b6aa544 100644 --- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch +++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch @@ -1,4 +1,4 @@ -From 4a99cb44a7913ff86e644dc08578e579958983a4 Mon Sep 17 00:00:00 2001 +From b0e46ec8b5f3a220a1660677c87cefa5fc3a7fc9 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 12 Oct 2015 09:55:30 +0200 Subject: [PATCH] configure: Separate host and build platform. @@ -15,14 +15,14 @@ Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc --- config.tests/unix/arch.test | 6 +- config.tests/unix/compile.test | 6 +- - configure | 163 ++++++++++++++++++++++++++++++++----- + configure | 164 ++++++++++++++++++++++++++++++++----- mkspecs/features/device_config.prf | 15 ++-- mkspecs/features/qt_functions.prf | 2 +- mkspecs/features/qt_tool.prf | 57 ++++++++----- qmake/qmake-aux.pro | 11 +++ qmake/qmake-docs.pro | 2 - qtbase.pro | 15 +--- - 9 files changed, 210 insertions(+), 67 deletions(-) + 9 files changed, 210 insertions(+), 68 deletions(-) create mode 100644 qmake/qmake-aux.pro delete mode 100644 qmake/qmake-docs.pro @@ -75,7 +75,7 @@ index 65bc874..45c365c 100755 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else diff --git a/configure b/configure -index d923bbb..175eb02 100755 +index 42e49c5..a244acb 100755 --- a/configure +++ b/configure @@ -104,9 +104,11 @@ QT_CONFIG= @@ -238,12 +238,12 @@ index d923bbb..175eb02 100755 - if [ "$BUILD_ON_MSYS" = "yes" ]; then + case `basename "$PLATFORM"` in + win32-g++*) - EXTRA_CFLAGS="-DUNICODE" - EXTRA_CXXFLAGS="-DUNICODE" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" EXTRA_OBJS="qfilesystemengine_win.o \ @@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" - EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32" + EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32" EXEEXT=".exe" - else + ;; @@ -251,17 +251,18 @@ index d923bbb..175eb02 100755 EXTRA_OBJS="qfilesystemengine_unix.o \ qfilesystemiterator_unix.o \ qfsfileengine_unix.o \ -@@ -4068,7 +4103,8 @@ \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" +@@ -4088,8 +4123,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" EXEEXT= - +- - fi + ;; + esac if [ "$BUILD_ON_MAC" = "yes" ]; then echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" -@@ -4089,6 +4125,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4110,6 +4145,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; if [ '!' -z "$D_FLAGS" ]; then EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" fi @@ -269,7 +270,7 @@ index d923bbb..175eb02 100755 echo >>"$mkfile" adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` -@@ -4178,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf" +@@ -4179,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf" cat > "$QTCONFFILE" <> "$QTCONFFILE" <> "$QTCONFFILE" <> "$QTCONFFILE" <> "$QTCONFFILE" <> "$QTCONFFILE" </dev/null +@@ -4354,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then # Do the same test again, using the host compiler @@ -419,7 +420,7 @@ index d923bbb..175eb02 100755 if [ $? -eq 0 ]; then eval `cat "$OUTFILE"` else -@@ -4569,7 +4694,7 @@ fi +@@ -4570,7 +4694,7 @@ fi # detect mips_dsp support if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then @@ -428,7 +429,7 @@ index d923bbb..175eb02 100755 CFG_MIPS_DSP=yes else CFG_MIPS_DSP=no -@@ -4580,7 +4705,7 @@ fi +@@ -4581,7 +4705,7 @@ fi # detect mips_dspr2 support if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then @@ -437,7 +438,7 @@ index d923bbb..175eb02 100755 CFG_MIPS_DSPR2=yes else CFG_MIPS_DSPR2=no -@@ -7467,7 +7592,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null +@@ -7471,7 +7595,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null cd .. fi @@ -475,10 +476,10 @@ index e0383ef..9281d3e 100644 # Provide a function to be used by mkspecs defineTest(deviceSanityCheckCompiler) { diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index b2c2507..c16005f 100644 +index 8639695..e250959 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -57,7 +57,7 @@ defineTest(qtHaveModule) { +@@ -70,7 +70,7 @@ defineTest(qtHaveModule) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c4dc5609..1a99eaad 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -249,4 +249,4 @@ sysroot_stage_dirs_append() { rm -rf $to${OE_QMAKE_PATH_QT_FONTS} } -SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" +SRCREV = "8ce657d0279566ef327af1b88339534041ddc012" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 4990f348..5b12d1a7 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 = "b351fb164af327828c9bdbc414ffd8e47e387e8c" +SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index cf6d3c51..8c52b844 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 = "dec32076b9153febc575a0418af702f8cb400258" +SRCREV = "80b6557be3a23a5118ddf8c4b68bc28b66f52b49" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 24825ec2..141cde36 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -38,6 +38,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "0fab5761d5428aa708edd66e40fc3c449adc4b11" +SRCREV = "d438b4f4b93d04a841edf031359e26af617d889d" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 5590abdd..c8806f14 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 = "60a135102aaa37d0d817883e4d6aed456372709d" +SRCREV = "a6434420574f775d3afa6e8912eb2ede8429db90" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index c35cc809..606b873a 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 = "24f3fd69a2e953619c48b4a632262ce8419fee40" +SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index b49940be..4c4431d4 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" -SRCREV = "58f19cf8d51e06f1781f3142e6d872e5feb0690e" +SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 50729032..d1dfec5b 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 += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" -SRCREV = "03163a3c9129b7f982b690e750056506c3d06b41" +SRCREV = "f40e92b147560be15e0f53dfd7f6b2d698c00fb9" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ce423021..bb0a506d 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 = "3b6de26fe585c586d055ac86c5911cc6df0e3887" +SRCREV = "3fb3231a9e22dcb780d5b31ec57896429d40b0e5" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index e0a264d4..25e8b701 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -23,4 +23,4 @@ do_configure_prepend() { sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro } -SRCREV = "87f2415adf34da08e6cd58f5da6f6a7d0d9cf141" +SRCREV = "bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 1e25d6e0..117c0079 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "93d06fb27d7eae9290db33b6684916a225939f0b" +SRCREV = "b1d29faf96ee6323bf2dad054291fd7c30a30c05" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 32f6ebf3..565ca843 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 = "a5e814fd8809dd6a8a3c3efd4b911b36e3325a2a" +SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 4fbd15b1..16c20956 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 = "fbaca62cd0a7309f04bf82101c8e20dbbf423192" +SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index f32a8e13..4139db1f 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 = "02e4a66a8bd9ce4d2f7f8c89cd1bddf4b6385b5f" +SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" 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 c0e13898..00000000 --- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 ---- - 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.0 - diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index d2699f70..93dc51eb 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 = "a9ac71a443260de66f720f0184646847b03fcb46" - -SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" +SRCREV = "b722836765dccca04683939d0d4f72a9e2585d88" 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 c4c0a14d..1e216e45 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 1140fd4bb5768d49cad9e834a9ce5eb05b711d0e Mon Sep 17 00:00:00 2001 +From 6ae63cf69985c740d2b45242c1f1bb962c6c8b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries @@ -18,15 +18,16 @@ Signed-off-by: Andreas Müller 1 file changed, 2 insertions(+) diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro -index 168d23d..a9c3b59 100644 +index 37d5ba4..ca90a68 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro -@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \ - # access to clucene +@@ -59,4 +59,6 @@ HEADERS += qhelpenginecore.h \ HEADERS += qhelpsearchindexwriter_clucene_p.h \ qhelpsearchindexreader_clucene_p.h -+ + +LIBS += -lQt5CLucene ++ + load(qt_module) -- -2.7.0 +1.9.1 diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 89916337..eaeeca7b 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 += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" -SRCREV = "05206b44cf25ca6a895cc9a8716f2b7f2f14191f" +SRCREV = "aec1d10c66a676781c767099e81871faa040162f" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 7908a3e5..b7bdd7fc 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 = "ce85e4ee4ee22e5dea3b44707a27dab44319708e" +SRCREV = "cbef985e3c3e9af2d124d40959fc674b3b8aa33f" diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index c88cf696..21827d74 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 = "bebe9beff3e9874498474cec32634cf281ddc453" +SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 78d8a3eb..1b4f899c 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 = "bebe9beff3e9874498474cec32634cf281ddc453" +SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index eb4475b6..79c6b23f 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 = "3fa1c9d2cf5e00e7431d042e7955a6dd75e6e2b1" +SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 32a6459d..205193fa 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -119,8 +119,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "3f02c25de46f5ff296b8189af3435ce5800b39a7" -SRCREV_chromium = "779a2388fc123a7f3a178ce2ced921ee4a307e2c" +SRCREV_qtwebengine = "4ed08bb0a8195746c333dabbdb9da3400d174296" +SRCREV_chromium = "0a385bb01d9cf060fae4c9d350ee98561654df96" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 04cefada..2e05b814 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -72,4 +72,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 = "d2ff5a085572b1ee24dcb42ae107063f3142d14e" +SRCREV = "3b4c850361abbc2aae556dbf99c8e4c8086ae569" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index fbce6be6..6ddfd780 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 = "2d8c94cf11097b61689757f8a0162bb7dd9d7d0b" +SRCREV = "3b128f9b45f4fafc305ff0c89cfc2cb665c856d5" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 0ae8e4a2..d8beb500 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 = "5df9fa8f3a7209c067a5d5068776b9aa52273d3b" +SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index c4245628..398d4a3e 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 = "a8d103a05bc195dd045779f3aebdf67bd0140df1" +SRCREV = "7a8d395a3b1eb5f24aa96509666326bad4218c14" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3