From 9371bfaf4c72f429eb2ab28316ef9a9be2b00c65 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 30 Aug 2017 09:10:16 +0300 Subject: qtwebview: include qtwebview into image and toolchain Task-number: QTBUG-61124 Change-Id: Ibf8920c2bd42bbff192923f8f7c8b95e5216ead5 Reviewed-by: Mikko Gronoff --- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 211ba0a..7a22951 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -70,7 +70,7 @@ RDEPENDS_${PN} += " \ qttools-staticdev \ qtvirtualkeyboard-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev qtwebview-dev', '', d)} \ qtwebsockets-dev \ qtwebchannel-dev \ qtxmlpatterns-dev \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 081d8fe..8ad37d8 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -70,7 +70,7 @@ RDEPENDS_${PN} += " \ qttranslations-qtwebsockets \ qttranslations-qtxmlpatterns \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qttranslations-qtwebengine qtwebview', '', d)} \ qtwebsockets \ qtwebchannel \ qtxmlpatterns \ -- cgit v1.2.3-54-g00ecf From 95440484a0fe59f19ae49edeaf32bcde5cdfc5bf Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 14 Sep 2017 09:57:14 +0300 Subject: qtdeviceutilities: update component Adds a wifi example Change-Id: Ie148c293115e042910c94040ea5efc694e7460e1 Reviewed-by: Ville Voutilainen --- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index 3b8f18c..c22024d 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -43,6 +43,6 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ " -SRCREV = "43e4b847851afc5d00664a9e88ef825ca9fedd02" +SRCREV = "03b3e6fd62ff9e9a80212a313340e0a0c2f0135f" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From 81831558b4dfdeb5030d6519f29d9ce122a434ce Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 15 Sep 2017 08:24:43 +0300 Subject: sdk: fix host_build QT_ARCH mkpecs/qconfig.pri defines QT_ARCH and QT_BUILDARCH separately for host_build and target build and both of these were always set to target architecture. This cause issues in the SDK, if component tried to build host tools using these values, which qtwebengine does. Fixed now, so that the host_build variants are taken from the nativesdk's mkspecs/qconfig.pri. Task-number: QTBUG-63155 Change-Id: I44644c97d634dac6297e28cc851fc31f7eaf1f90 Reviewed-by: Mikko Gronoff --- classes/populate_b2qt_qt5_sdk.bbclass | 9 +++++++++ .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 1 + 2 files changed, 10 insertions(+) diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index fd7b43c..453d94e 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass @@ -30,6 +30,7 @@ inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs" +NATIVE_SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKPATHNATIVE}${libdir}/${QT_DIR_NAME}/mkspecs" SDK_MKSPEC = "devices/linux-oe-generic-g++" SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri" SDK_DYNAMIC_FLAGS = "-O. -pipe -g" @@ -66,6 +67,14 @@ EOF echo 'HostSpec = linux-g++' >> $qtconf echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf + # Update correct host_build ARCH and ABI to mkspecs/qconfig.pri + QT_ARCH=$(grep QT_ARCH ${NATIVE_SDK_MKSPEC_DIR}/qconfig.pri | tail -1) + QT_BUILDABI=$(grep QT_BUILDABI ${NATIVE_SDK_MKSPEC_DIR}/qconfig.pri | tail -1) + + sed -e "0,/QT_ARCH/s/^.*QT_ARCH.*/$QT_ARCH/" \ + -e "0,/QT_BUILDABI/s/^.*QT_BUILDABI.*/$QT_BUILDABI/" \ + -i ${SDK_MKSPEC_DIR}/qconfig.pri + create_qtcreator_configure_script # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index a65435f..c3f07b8 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -43,6 +43,7 @@ RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qttools-tools \ nativesdk-qtbase-tools \ + nativesdk-qtbase-tools-dev \ nativesdk-qtbase-tools-staticdev \ nativesdk-qtdeclarative-tools \ nativesdk-qtdeclarative-staticdev \ -- cgit v1.2.3-54-g00ecf From 545bebca0722c21c4cd61c47260202bda20f2db4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 Sep 2017 13:15:00 +0300 Subject: qtquickcompiler: fix path for QT_HOST_BINS Bitbake builds need to use QT_HOST_BINS/get for getting the correct path to the host tools. Change it for qtquickcompiler.prf so that project can use CONFIG+=qtquickcompiler without need to have CONFIG+=no_qtquickcompiler_depend as well. Change-Id: I5196e06f249531833fccca6b0b6a213016270ab6 Reviewed-by: Mikko Gronoff --- classes/qtquickcompiler.bbclass | 2 +- recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 3 +++ recipes-qt/qt5/qtquickcompiler_git.bb | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index c36e4c4..3a1bcbe 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -49,5 +49,5 @@ python __anonymous() { d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) else: d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) - d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") + d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler") } diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb index 98c3deb..b21b2ce 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb @@ -56,6 +56,9 @@ do_install() { install -d ${D}${OE_QMAKE_PATH_BINS} install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS} fi + + # Use the EffectivePath instead of installation path + sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf } do_install_append_mingw32() { diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index e684364..ae3e87f 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -43,4 +43,9 @@ S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative" +do_install_append() { + # Use the EffectivePath instead of installation path + sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf +} + BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf From bb086957d285087b6345b44eb6e30381943af2d6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 26 Sep 2017 11:52:32 +0300 Subject: poky, meta-oe: update morty branch layers Update both layers to latest revisions to pull in security fixes, build fixes & other updates. Task-number: QTBUG-63281 Change-Id: I0eb520c336a39833219a61f9a59c7258916aeae2 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ab7bdf2..94c9b2a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,11 +16,11 @@ Date: Fri, 8 Sep 2017 08:25:03 +0300 Subject: meta-qt5: update layer - Pull in lots of commits from upstream/master - Update qtglesstream recipe to newer version to fix build break Change-Id: Icd3452fe11c572432f372df288456d688b6ba7fe Reviewed-by: Samuli Piippo --- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 57eae88..bbf3d00 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -38,7 +38,7 @@ SRC_URI = " \ " PV = "1.0.0" -SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2" +SRCREV = "114e5a1941f831d082395ed80a017f45d3b71a63" BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 94c9b2a..660050b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 27 Sep 2017 15:01:48 +0300 Subject: quickcompiler: update revision Change-Id: If69cf7ec729ec206931cc324ad7786c2d887c3dc Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index ae3e87f..c5b6ef2 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "d450627682ddacb21712b869e43502addafad891" +SRCREV = "0203d381423a6423bf8816905f08d65e6f0755b7" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From cb6f8788d3e1de2540751f25a923438d3f3bf868 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 28 Sep 2017 22:02:43 +0300 Subject: meta-qt5: update meta layer Updates Qt modules to 5.9.2 snapshot 1 Change-Id: Ia798f3cb855484ccb924a9cfcb181b90baebac04 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 660050b..4de45d2 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Fri, 29 Sep 2017 09:48:03 +0300 Subject: Add generic qemuarmv7 machine config To be used in Qt CI builds Task-number: QTQAINFRA-1457 Change-Id: I7ef21aa05c65f50539e2f70b21da375a9b3eea02 Reviewed-by: Sami Nurmenniemi --- conf/machine/qemuarmv7.conf | 8 ++++++++ scripts/upload.sh | 1 + 2 files changed, 9 insertions(+) create mode 100644 conf/machine/qemuarmv7.conf diff --git a/conf/machine/qemuarmv7.conf b/conf/machine/qemuarmv7.conf new file mode 100644 index 0000000..530f802 --- /dev/null +++ b/conf/machine/qemuarmv7.conf @@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: generic armv machine +#@DESCRIPTION: Machine configuration for running a generic armv7 + +DEFAULTTUNE = "armv7athf-neon" + +require conf/machine/include/qemu.inc +require conf/machine/include/arm/arch-armv7a.inc diff --git a/scripts/upload.sh b/scripts/upload.sh index 4f4e1a8..e77f96d 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -37,6 +37,7 @@ UPLOADS="\ tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ + tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ " for f in ${UPLOADS}; do -- cgit v1.2.3-54-g00ecf From 893105e4e47cbd27362d2bb712518d047d40f947 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 2 Oct 2017 09:59:20 +0300 Subject: meta-qt5: update to 5.9.2 RC * Update meta-qt5 layer to 5.9.2 RC * Keep qtsystems module in the old revision. Updating it requires lots of changes to emulator related recipes due API & other changes in qtsimulator module Change-Id: I679d8f45df474d8a14c989d51e0862255651e079 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtsystems_git.bbappend | 4 +++- scripts/manifest.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 2a949eb..57c8285 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -29,3 +29,5 @@ EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" DEPENDS_append_emulator = " qtsimulator" + +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4de45d2..d2257ac 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 4 Oct 2017 10:20:45 +0300 Subject: qt5: update qtx11extras submodule & quickcompiler revision Update 5.9.2 RC content with missing changefile & doc updates Change-Id: Ib42c88d565870607fdc1017016692e3f2b66e964 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 4 ++-- scripts/manifest.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index c5b6ef2..be10a78 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "0203d381423a6423bf8816905f08d65e6f0755b7" +SRCREV = "dd96b1d76162d719f9ba572d2c4659f7bcd47710" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d2257ac..439bcfa 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 4 Oct 2017 11:26:32 +0300 Subject: qdb: remove bashishm from the init script The function keyword does not work in bourne shell Change-Id: I8de750c3b310e9dcc5f039cba389e5e816f003c3 Reviewed-by: Sami Nurmenniemi --- recipes-qt/b2qt-addons/qdbd/qdbd-init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh index bcc22a8..15981b0 100755 --- a/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh +++ b/recipes-qt/b2qt-addons/qdbd/qdbd-init.sh @@ -46,7 +46,7 @@ GADGET_CONFIG=$CONFIGFS_PATH/usb_gadget/g1 . /etc/default/qdbd -function initialize_gadget() { +initialize_gadget() { # Initialize gadget with first UDC driver for driverpath in /sys/class/udc/*; do drivername=`basename $driverpath` @@ -55,7 +55,7 @@ function initialize_gadget() { done } -function disable_gadget() { +disable_gadget() { echo "" > $GADGET_CONFIG/UDC } -- cgit v1.2.3-54-g00ecf