summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-04-27 13:37:25 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-03-24 11:13:28 +0100
commit40f1b73c92731f4e18751d3a499f269c65c21a96 (patch)
tree734faeca0e9ccade77c66f04320bf50071ecbf6b /meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
parente45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (diff)
downloadopenembedded-core-contrib-40f1b73c92731f4e18751d3a499f269c65c21a96.tar.gz
qt5: downgrade to 5.6jansa/pseudo
* 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>
Diffstat (limited to 'meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch')
-rw-r--r--meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
deleted file mode 100644
index cf1a716f6e..0000000000
--- a/meta/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e3fe48be51aa67227ac1b34c01e4c913d82866c2 Mon Sep 17 00:00:00 2001
-From: Pascal Bach <pascal.bach@siemens.com>
-Date: Wed, 11 May 2016 15:20:41 +0200
-Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
- isn't set
-
-This prevents errors like:
-
-| The imported target "Qt5::Core" references the file
-|
-| "/qmake"
-|
-| but this file does not exist. Possible reasons include:
-
-Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS.
-To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake
-file. And in the case where the variable is not set we just return which is basically
-equal to telling CMake that Qt5 wasn't found.
-
-Upstream-Status: Pending
- The patch only makes sense in connection with other patches included here.
- Specifically this are:
- - 0003-Add-external-hostbindir-option.patch
- - 0010-Add-external-hostbindir-option-for-native-sdk.patch
-
-Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
----
- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++
- src/corelib/Qt5Config.cmake.in | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 55c74aa..f9ec328 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
-
-+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
-+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
-+ return()
-+endif()
-+
- !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
- !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
- set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
-diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
-index 75b5348..ed31888 100644
---- a/src/corelib/Qt5Config.cmake.in
-+++ b/src/corelib/Qt5Config.cmake.in
-@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
- message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\")
- endif()
-
-+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
-+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
-+ return()
-+endif()
-+
- if (NOT Qt5_FIND_COMPONENTS)
- set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\")
- set(Qt5_FOUND False)