From e3031b6ff5caf9e2e890657bdc02eca58a1fb3db Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 22 Aug 2017 14:49:52 +0300 Subject: qt5: update meta-qt5 layer Update submodules to Qt 5.9.2 (snapshot 2) Change-Id: I3b6a17ea72ef1ba9f86ec8664292a3a5686ebde5 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 502d7b2..e55bdeb 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 21 Aug 2017 13:21:13 +0300 Subject: Fix DNS for Qemu running on b2qt toolchain sysroot The b2qt toolchain had broken link in sysroot/etc/resolv.conf. It was pointing to ../run/resolv.conf which is correct on actual device that gets the file dynamically from systemd. That file is never created for the toolchain and DNS operations fail. This change removes the link from the toolchain. Task-number: QTBUG-62580 Change-Id: I52098e667a9190e300a06b777f9fac778a545faf Reviewed-by: Samuli Piippo --- classes/populate_b2qt_qt5_sdk.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index 7acd095..fd7b43c 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass @@ -67,6 +67,9 @@ EOF echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf create_qtcreator_configure_script + + # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it + rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf } create_qtcreator_configure_script () { -- cgit v1.2.3-54-g00ecf From 3ea25fe2098d00f81448441cd5a3430d15ecc2c1 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 25 Aug 2017 07:52:38 +0300 Subject: b2qt-appcontroller: update SRCREV Change-Id: Icf89fecc5c0fc906375b08483d91a1808b739777 Reviewed-by: Samuli Piippo --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index f1482a4..9c52606 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.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. @@ -29,7 +29,7 @@ DESCRIPTION = "Boot to Qt Appcontroller" LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17" inherit qmake5 require recipes-qt/qt5/qt5-git.inc @@ -39,7 +39,7 @@ SRC_URI = " \ file://appcontroller.conf \ " -SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" +SRCREV = "5ab7fdbf0845c40418272bafa565295511055d3b" DEPENDS = "qtbase" -- cgit v1.2.3-54-g00ecf From bc7d6b4c3b4e62142bd909048cc82b73db5ba53e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 25 Aug 2017 10:39:53 +0300 Subject: qtdeviceutilities: update module * Changelog: Doc: Bump version to 5.9.2 Introduce a placeholder for removed wired networks Display the current IP address for a wifi connection Set the method indexes for the comboboxes at a more suitable time Allow editing ipv4 settings in manual mode directly after saving Use both IPv4.Configuration and IPv4 for reading connman settings Doc: Bump version to 5.9.1 Set a default netmask and gateway if the user didn't provide them Remove qt config option from settingsuiplugin Doc: Bump version to 5.9.0 Change-Id: I5c96a675e60e8adae5cc96e29edbf567dffa5f24 Reviewed-by: Ville Voutilainen --- recipes-qt/qt5/qtdeviceutilities.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index 473ab4d..3b8f18c 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.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. @@ -43,6 +43,6 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ " -SRCREV = "48fb704e64300387f99c4192436728858c8aa4f8" +SRCREV = "43e4b847851afc5d00664a9e88ef825ca9fedd02" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From a7999b69d3f3ee33d184494486c75e89e104bab0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 25 Aug 2017 15:18:10 +0300 Subject: sdk: add qtwayland tools to the toolchain qtwayland-scanner was missing from the toolchain. Task-number: QTBUG-62800 Change-Id: I5e9edc2ee6f8a2004f1d3fce1bc6258d9a1381e3 Reviewed-by: Mikko Gronoff --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 1 + 1 file changed, 1 insertion(+) 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 7dab944..036410c 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 @@ -42,4 +42,5 @@ RDEPENDS_${PN} += "\ nativesdk-qtdeclarative-staticdev \ nativesdk-qt3d-tools \ nativesdk-qtscxml-tools \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-tools', '', d)} \ " -- cgit v1.2.3-54-g00ecf From 21caf9ba0ffc1371c261a1a9c0e930a0ee2c277d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 29 Aug 2017 16:42:02 +0300 Subject: sdk: don't add qtwayland-scanner to mingw toolchain There are number of wayland dependencies that will not compile for mingw toolchain. Task-number: QTBUG-62800 Change-Id: I2ffda4eb00831f21a27202d0a901cdb9719fe7f7 Reviewed-by: Mikko Gronoff --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 9 +++++++++ 1 file changed, 9 insertions(+) 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 036410c..a65435f 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 @@ -33,6 +33,12 @@ PR = "r0" inherit nativesdk packagegroup qtquickcompiler +python __anonymous() { + overrides = d.getVar("OVERRIDES", True).split(":") + if "mingw32" not in overrides: + d.appendVar("OVERRIDES", ":linux") +} + RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qttools-tools \ @@ -42,5 +48,8 @@ RDEPENDS_${PN} += "\ nativesdk-qtdeclarative-staticdev \ nativesdk-qt3d-tools \ nativesdk-qtscxml-tools \ + " + +RDEPENDS_${PN}_append_linux = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-tools', '', d)} \ " -- cgit v1.2.3-54-g00ecf From 0a606b46deaa7938308eebf068dc204c33984332 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 31 Aug 2017 10:08:00 +0300 Subject: meta-qt5: update layer Updates Qt submodules to 5.9.2 (snapshot 3) Change-Id: I8f4dbb7d00daa49e881b4a1cf1b87de3d671acdb Reviewed-by: Kari Oikarinen --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e55bdeb..ab7bdf2 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/>