From 40f1b73c92731f4e18751d3a499f269c65c21a96 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 27 Apr 2018 13:37:25 +0000
Subject: qt5: downgrade to 5.6

* webosose isn't compatible with newer Qt

export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c compile ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake  -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra tmp-glibc/work/qemux86-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done

in local.conf I have only this to reproduce the failures:
PRSERV_HOST = "localhost:0"

BB_NUMBER_THREADS = "8"
PARALLEL_MAKE = "-j 32"

DISTRO_FEATURES_append = " wayland opengl"
ERROR_QA_append = " host-user-contaminated"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../0001-Allow-a-tools-only-build.patch            | 37 ----------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 meta/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch

(limited to 'meta/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch')

diff --git a/meta/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/meta/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
deleted file mode 100644
index 19b526c992..0000000000
--- a/meta/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6235a3fdd0807205c818d70582033970ee008013 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 7 Jun 2017 15:17:12 +0300
-Subject: [PATCH] Allow a tools-only build
-
-Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706
----
- mkspecs/features/repccommon.pri | 2 +-
- qtremoteobjects.pro             | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri
-index 5e88bf8..6efd19e 100644
---- a/mkspecs/features/repccommon.pri
-+++ b/mkspecs/features/repccommon.pri
-@@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc
- contains(QMAKE_HOST.os, Windows) {
-     cmd = $$system_path($${cmd}.exe)
- }
--exists($$cmd): QT_TOOL.repc.binary = $$cmd
-+false:exists($$cmd): QT_TOOL.repc.binary = $$cmd
- 
- # qtPrepareTool honors QT_TOOL.repc.binary if set
- qtPrepareTool(QMAKE_REPC, repc)
-diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro
-index c2e2b6b..93c2bb5 100644
---- a/qtremoteobjects.pro
-+++ b/qtremoteobjects.pro
-@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools
- load(qt_parts)
- 
- SUBDIRS += mkspecs
-+
-+tools-only {
-+    sub_tools.depends -= sub_src
-+    SUBDIRS = sub_tools
-+}
-- 
cgit 1.2.3-korg