diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-08 14:50:02 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-13 08:19:06 +0000 |
commit | e6897ccd0eec8fb5229e0fdd8f354292e0f49a16 (patch) | |
tree | 5dadb267230428197ee7195f610db8450a352b93 | |
parent | fc91b16ed2a877412cd3a67023a6217e8671c3e4 (diff) |
qt5: update submodules
Change-Id: I0d5b877609f761c8bcca90c118cceb15d61a3dcc
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
27 files changed, 37 insertions, 36 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index bf9875b5..8cf21f62 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -240,4 +240,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 3d4b6784..03835310 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 = "a21a4e0391b81307d96364db7af3b8bd343d773f" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 7d79b04c..397369e1 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 = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index b254d8a5..ea261e8c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -207,4 +207,4 @@ do_install_append() { RRECOMMENDS_${PN}-plugins += "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "1d8030cc64df2cdfdc0faf3d06ea7d9ed0306948" +SRCREV = "36bc2477753d19a14c587b97d4ec4f263e9e16c0" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index a2b19dee..3f5c074d 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 = "be7e1d548ae150acb60e1716c9dfd4edd1fa4367" +SRCREV = "4f4eda51954b7983016e6a062d3db77a68c2ad67" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 82754c9e..2023391b 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 = "5237ff0cb86a713845019ffd98d6066af00f71f7" +SRCREV = "f8857127320f513e9ec2132bc4af5c470362f37a" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b02fa81d..a1a4e672 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 = "ab2c5be35dd8f339ec39f52364625a53fa6d0ded" +SRCREV = "f5afec250cc63ba3a7b1cc78f51d5eb0031dd478" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 5066eb7a..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 = "f253f76aca4eb82a6df11c00a25c178e16253c9d" +SRCREV = "0f6e294fb8534f677a5ec75113679cfe24f559c1" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 950b4a7d..93cbcfd1 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 = "74d92ef80f5e13f2e10a592e0389a10bbeab189e" +SRCREV = "f086de0f3a67698b8066576a423298aadf566e13" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index ce87c850..bca4e1ca 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 = "cb800de1f42aaacdeb423d30adbcbf8975e32f2f" +SRCREV = "2d59367241aafbfe6acb30202f64e30697028bd9" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 517940b0..420ee9e4 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 = "a6ce801018a4254efeab000efa2457317270939b" +SRCREV = "e176f25daeb3d80af1fd701000fda065064227e1" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 2dfd97eb..4b76ad6e 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 = "9500aadc219481d89d32e5c2a2de10b0740c50de" +SRCREV = "0d8366273dcb9af5dae641c7efbc6db878942422" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index cfc06233..4221c3da 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 = "1c5f765658432a08ed52523c3a4547ab2b4a58f1" +SRCREV = "c24118685d6eb4cacf5f6af96215ba89ecc28604" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ad06c941..b6499ebb 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 = "0af88dc973d3410cdd905265ce935916693b2d44" +SRCREV = "a775b9da4794f1f248b63a4a58ee6ad6885f0622" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6418a923..82b59f86 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 = "5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2" +SRCREV = "f8e256271f919c36c8d97eae27b1d11678294e70" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 71da104d..3ff775ed 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 = "5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1" +SRCREV = "f8449352c9af0ee8055c6a85981e092e9d109b9d" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index bf96be43..3cb23525 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "4ef60892ce9e8dea75a31b0be7895ebf473346a9" +SRCREV = "8c23084b207baed7cf58c17e475baa34b889ead2" SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" 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 c8c21265..9edc29a5 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,7 +1,7 @@ -From 431db9926107563b44e2443cb8da8e0b1278a18c Mon Sep 17 00:00:00 2001 +From 0f11ccdb0683554595fe7f223071621902c0b315 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 2/4] assistant/help: fix linking of dependent libraries +Subject: [PATCH] assistant/help: fix linking of dependent libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,15 +18,16 @@ 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 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.1 +1.9.1 diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1094162b..c3338228 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 = "852f4e4cf87d7db0eaa87384b1589e151f76e6cd" +SRCREV = "f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index a31add6b..4364b2d0 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -4,7 +4,7 @@ require qt5-git.inc LICENSE = "(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=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ " @@ -113,4 +113,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "510ee7f04035dc64d43be29716d6d8079a8d908a" +SRCREV = "745f8d5329d0d6d98a8577a254d2ee3e7174634e" diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 20c00aa4..20ff8d0c 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 = "1edfb6651b4433fe0b0681eb40f1472757640dda" +SRCREV = "01daa660d04e8960961988da6191e80c05a84d58" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 2cdd8b32..55327516 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 = "1edfb6651b4433fe0b0681eb40f1472757640dda" +SRCREV = "01daa660d04e8960961988da6191e80c05a84d58" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b5702c7e..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 = "a9bad172f62fe1dda280df5477a8b7c1bd57690d" +SRCREV = "a2c3b32d08ed24279609a8c01b09c1147a9ff6b9" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 4443638c..f1fde794 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -109,7 +109,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "47-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 \ @@ -122,8 +122,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "66e01f2866479fe9f27f663ddcdc32fefb52e193" -SRCREV_chromium = "df7c5f41e9f7e6a1382706e99bd78c4b7e3d1201" +SRCREV_qtwebengine = "1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2" +SRCREV_chromium = "eed57693d22920959d6b7c8f2b1b90b501994760" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 81554277..1b56455b 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 = "c00241ac0389cc4ee03252030e6de1257a9b50fd" +SRCREV = "c6d19a89046763f680d7f67c6f9989b4f51fc71e" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ac3e145e..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 = "5df6e708b64e22f98a053145011b6da917257174" +SRCREV = "b414120c60ef8c3cc2aad7dca41092647d741a36" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index eca5b1fb..d8892ed8 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 = "b24bd0e87891d9f61e0121cbdcbbe0797863f316" +SRCREV = "20e5ddeba66121e59058fbe00896e25b5f82ed44" BBCLASSEXTEND =+ "native nativesdk" |