summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@qt.io>2017-12-21 15:41:03 +0000
committerJędrzej Nowacki <jedrzej.nowacki@qt.io>2017-12-21 15:53:53 +0000
commitdc54011a33b846e73d1c19dad173c715c09c675d (patch)
treecc20c331d84b665e900ccdad691d6f6f5410fcde /scripts
parent6f79fa92a467d160c348a11bc24c340c72ac669d (diff)
downloadmeta-boot2qt-dc54011a33b846e73d1c19dad173c715c09c675d.tar.gz
Revert "meta-qt5: Update meta layer"
This reverts commit 6f79fa92a467d160c348a11bc24c340c72ac669d. It broke qtbase build and therefore it blocks qtdeclarative in dev branch. QtBase needs to be fixed before applying this. kernel/qnetworkinterface_linux.cpp: In instantiation of ‘void {anonymous}::ProcessNetlinkRequest<Lambda>::operator()(int, nlmsghdr*, char*, size_t, Lambda&&) [with Lambda = getInterfaces(int, char*)::<lambda(ifinfomsg*, size_t)>; size_t = unsigned int]’: kernel/qnetworkinterface_linux.cpp:216:36: required from ‘void {anonymous}::processNetlinkRequest(int, nlmsghdr*, char*, size_t, Lambda&&) [with Lambda = getInterfaces(int, char*)::<lambda(ifinfomsg*, size_t)>; size_t = unsigned int]’ kernel/qnetworkinterface_linux.cpp:319:6: required from here kernel/qnetworkinterface_linux.cpp:161:48: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] kernel/qnetworkinterface_linux.cpp: In instantiation of ‘void {anonymous}::ProcessNetlinkRequest<Lambda>::operator()(int, nlmsghdr*, char*, size_t, Lambda&&) [with Lambda = getAddresses(int, char*, QList<QNetworkInterfacePrivate*>&)::<lambda(ifaddrmsg*, size_t)>; size_t = unsigned int]’: kernel/qnetworkinterface_linux.cpp:216:36: required from ‘void {anonymous}::processNetlinkRequest(int, nlmsghdr*, char*, size_t, Lambda&&) [with Lambda = getAddresses(int, char*, QList<QNetworkInterfacePrivate*>&)::<lambda(ifaddrmsg*, size_t)>; size_t = unsigned int]’ kernel/qnetworkinterface_linux.cpp:423:6: required from here kernel/qnetworkinterface_linux.cpp:161:48: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] Makefile:26401: recipe for target '.obj/qnetworkinterface_linux.o' failed make[2]: *** [.obj/qnetworkinterface_linux.o] Error 1 make[1]: *** [sub-network-make_first] Error 2 make: *** [sub-src-make_first] Error 2 Change-Id: I51d13a67335c5aea8242f9f0f88bb8225dfce030 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/manifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index f4d2e3d..7cf38d1 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,7 +24,7 @@
24 path="sources/meta-openembedded"/> 24 path="sources/meta-openembedded"/>
25 <project name="meta-qt5" 25 <project name="meta-qt5"
26 remote="qtyocto" 26 remote="qtyocto"
27 revision="5d320ab6ecde34725ceef536f9d9229fb2125acf" 27 revision="479384fc4beeb291a971b3f16731ba5c18a00319"
28 path="sources/meta-qt5"/> 28 path="sources/meta-qt5"/>
29 <project name="meta-mingw" 29 <project name="meta-mingw"
30 remote="qtyocto" 30 remote="qtyocto"