From 20e32018b7e29af39cb6315f5f6e575a662896e4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Aug 2016 16:51:03 +0300 Subject: qtquickcompiler: update revision Fix for segfault Change-Id: Iab8e4551eba94635116f1adab39516b8a8e3da23 Task-number: QTBUG-55394 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 4b9abd8..446cca3 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "321c7d8bbc9e25fbb49dbba187b04916eddfdb2a" +SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ef78418..e697249 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,6 +26,9 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc +# Workaround for QTBUG-55471 +export QV4_NO_SSA = "1" + SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" -- cgit v1.2.3-54-g00ecf From 81c077be4feadc874a4c09b7c4bb2512ba2d85cf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Aug 2016 08:33:41 +0300 Subject: qtquickcompiler: update revision Change-Id: Iad6d6a3015e79a4e8213f14450b08e99ea73aa24 Task-number: QTBUG-55471 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 446cca3..e0091b4 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b" +SRCREV = "382935b1c5c93fba9ff2f25b74ec6a5337ec62d0" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index e697249..ef78418 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,9 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -# Workaround for QTBUG-55471 -export QV4_NO_SSA = "1" - SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" -- cgit v1.2.3-54-g00ecf From 20e52c9940fcb38a54bd87bbfff3a4905784d2a8 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 7 Sep 2016 14:03:15 +0300 Subject: qt5: update submodules using latest meta-qt5 Change-Id: Ic1ce180abb79beebf9a08dee4b64790e8a5d3c1b Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- scripts/manifest.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index ae8e6f4..cfab8e6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 8d86d39..9b8c5c6 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 19cd2d6..48b8165 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 4b7a38a..c5a129d 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "c6d72bb6ebd860a38aac2e557bca330b0d5b1926" +SRCREV = "8ed3130583510feba58e6f289d1c7b5d051a6663" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 934b40f..0439edb 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f5fe6ce47841be34d4b851725d80133ff6d14fee" +SRCREV = "21e7cb1bafdfc06c263e10067d02f9b103ff660f" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb index 1c45cb8..3e1152f 100644 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "334ca348b0badb284a1ade66b61bdc588da64e33" +SRCREV = "ab6739631dd87ffa480e79b33ea14aa97a66bc9e" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 8450938..609d934 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717" +SRCREV = "dcede8bbe1a4e1401679d42bf7179305771d0c5a" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3f93547..cbe9ab9 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "fafc158427e9d54298ce5c3419c1d4b6ec3b946e" +SRCREV = "7504b2ce36a90261ba2409e4160570b58d8b38e0" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ecc7f15..f4e1c3d 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "c9de25fa342ff8066d49541179c30d0ce45950b4" +SRCREV = "6d95682d7ff282180655f2f384d8aba69c4f67af" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index e0b892d..ea2046d 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "c0f58d5283ce981b8cfbc43f602a3b6553e26ce2" +SRCREV = "846d04cec8d946c28ddbeecc79c63553e0891736" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 30e96b2..579cc47 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" +SRCREV = "46d9a630a88fc5388dec7fd99289d0e9e0e1f680" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 491781c..bb934bc 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "0c63b3a441437a8bc42770d360a6696bbf11cd2d" +SRCREV = "c8305c87f805dbeb6cb5b09ac086a7651ef8c857" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index c8c7671..45a8ea6 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 4234480..44f6b33 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "85197ddb8d6da0e5cf74b8d945c076d4db3986a8" +SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index f8021a5..d33921b 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" +SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 793ed1b..c2522cb 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" +SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 793ed1b..c2522cb 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" +SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0a094f4..af3e87c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "b7fde78d7822ed7f2221acfd9db15b3ff579e29d" -SRCREV_chromium = "696c084930b870a5b1fd7f176d4e7ccb3eff416c" +SRCREV_qtwebengine = "2209add7a5b019afef7830d8bbf416fbb2a2ecf5" +SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 982fe66..861b21b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/> Date: Fri, 16 Sep 2016 12:42:24 +0300 Subject: Use new repo url for utils and appcontroller Repos are now open. Using codereview still, since mirroring to code.qt.io and github does not currently work. Change-Id: I03dfb0352bb8c9bbc182dfbd243eb648bfa2ce9a Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 9 +++------ recipes-qt/b2qt-addons/b2qt-utils.bb | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index b083a4f..c9682a5 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -23,18 +23,15 @@ DESCRIPTION = "Boot to Qt Appcontroller" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" -inherit qmake5 sdk-sources +inherit qmake5 +require recipes-qt/qt5/qt5-git.inc SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-appcontroller/ \ + git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \ file://appcontroller.conf \ " SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" - -S = "${WORKDIR}/git" DEPENDS = "qtbase" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index f43e450..ee26caf 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -23,17 +23,14 @@ DESCRIPTION = "Boot to Qt Utils module" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" -inherit qt5-module sdk-sources +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \ + git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ " SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" - -S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative wpa-supplicant" -- cgit v1.2.3-54-g00ecf From 2b115238356e2cfa963f004cb8469533d4d21305 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 19 Sep 2016 12:12:49 +0300 Subject: qt5: update submodules final qt 5.6.2 content Change-Id: I6b12d95cdc356a73f59c187d70676f2e17bb3b65 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index cfab8e6..0fb1a15 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 9b8c5c6..529748f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 48b8165..9c92738 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 95ef942..2c3ba90 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2778071f6c80b5397a183db37114aef881ade855" +SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index c5a129d..359c43d 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "8ed3130583510feba58e6f289d1c7b5d051a6663" +SRCREV = "1474e311738e2676b65c4c40dc7ff0dbf4d6a5bd" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 0439edb..f57a619 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "21e7cb1bafdfc06c263e10067d02f9b103ff660f" +SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb index 3e1152f..8597315 100644 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "ab6739631dd87ffa480e79b33ea14aa97a66bc9e" +SRCREV = "d09edf104dd05b472d3004484cc9bd47befb0a3d" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 609d934..f46ba76 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "dcede8bbe1a4e1401679d42bf7179305771d0c5a" +SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index cbe9ab9..a318e4e 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "7504b2ce36a90261ba2409e4160570b58d8b38e0" +SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index f4e1c3d..fd551c6 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "6d95682d7ff282180655f2f384d8aba69c4f67af" +SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index ea2046d..895e4f8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "846d04cec8d946c28ddbeecc79c63553e0891736" +SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 579cc47..4407369 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "46d9a630a88fc5388dec7fd99289d0e9e0e1f680" +SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index bb934bc..e4ef3c7 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "c8305c87f805dbeb6cb5b09ac086a7651ef8c857" +SRCREV = "0a4a5f7e1cbca7bd8b797603025534368de02cb7" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 7fbdf67..1bf4848 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b0e3e7469cf5249bb395d044c5344bbe88884553" +SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ef78418..e7ab947 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" +SRCREV = "13a199e6e2c5f27b0f12eff380df4f0c0d156e6e" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index c2522cb..b886d31 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" +SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index c2522cb..b886d31 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" +SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index af3e87c..97ba560 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "2209add7a5b019afef7830d8bbf416fbb2a2ecf5" +SRCREV_qtwebengine = "2f24e3c307aecb657736310948c7cdaad5176678" SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" -- cgit v1.2.3-54-g00ecf From 1bf6d63760efe5f4a9ce04083d556fd423db9542 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 09:49:12 +0300 Subject: Rename b2qt-utils to qtdeviceutilities Use the correct module name also in the recipe. Add PACKAGECONFIG to build with wpa-supplication support. Change-Id: Ia430912685478d077f997e410257ae1b92d93289 Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-utils.bb | 43 -------------------------------- recipes-qt/qt5/qtdeviceutilities.bb | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 43 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-utils.bb create mode 100644 recipes-qt/qt5/qtdeviceutilities.bb (limited to 'recipes-qt') diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb deleted file mode 100644 index 16ce360..0000000 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DESCRIPTION = "Boot to Qt Utils module" -LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" - -inherit qt5-module -require recipes-qt/qt5/qt5-git.inc - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ - " - -SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" - -DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb new file mode 100644 index 0000000..a4c0418 --- /dev/null +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +DESCRIPTION = "Qt Device Utilities" +LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc + +PACKAGECONFIG ??= "" +PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" + +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" + +SRC_URI = " \ + git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ + " + +SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" + +DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From 2b9e77c40609da75fa44e3376341f484e0ab0288 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 14:11:41 +0300 Subject: Rename last references to b2qt-utils Change-Id: I4b204b6dea02fd3e298eb66028b44139eb12ff2a Reviewed-by: Risto Avila --- .../packagegroups/packagegroup-b2qt-automotive-addons.bb | 1 - recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 1 - .../packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 11 +++++------ recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index 25a567d..391224e 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ b2qt-appcontroller \ - b2qt-utils \ qtivi \ neptune-ui \ neptune-ui-apps \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 9c2008d..3d60eed 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ b2qt-appcontroller \ - b2qt-utils \ b2qt-launcher \ b2qt-demos \ ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 652c931..ec3125b 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \ qt3d-dev \ qtbase-dev \ qtbase-staticdev \ - qtcanvas3d \ + qtcanvas3d-dev \ + qtcharts-dev \ qtconnectivity-dev \ + qtdatavis3d-dev \ qtdeclarative-dev \ qtdeclarative-render2d-dev \ qtdeclarative-staticdev \ + qtdeviceutilities-dev \ qtgraphicaleffects-dev \ qtimageformats-dev \ qtlocation-dev \ @@ -62,14 +65,10 @@ RDEPENDS_${PN} += " \ qtsvg-dev \ qttools-dev \ qttools-staticdev \ + qtvirtualkeyboard-dev \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ qtwebsockets-dev \ qtwebchannel-dev \ qtxmlpatterns-dev \ - \ - b2qt-utils-dev \ - qtcharts-dev \ - qtdatavis3d-dev \ - qtvirtualkeyboard-dev \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 8138b3e..c63ddb8 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \ qtdeclarative \ qtdeclarative-render2d \ qtdeclarative-tools \ + qtdeviceutilities \ qtgraphicaleffects \ qtimageformats \ qtlocation \ -- cgit v1.2.3-54-g00ecf