diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:40 +0000 |
| commit | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch) | |
| tree | 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtremoteobjects | |
| parent | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff) | |
qt5: upgrade to latest revision in 5.12
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete
ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.
* fixes #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtremoteobjects')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index a43dbeba..10ebdac9 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From cac05ba982e5047c11add015f6f6125863e5226d Mon Sep 17 00:00:00 2001 +From d278498bae51f730e77fee0c96eb2be8041fedda 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 @@ -23,10 +23,10 @@ index 5e88bf8..6efd19e 100644 # qtPrepareTool honors QT_TOOL.repc.binary if set qtPrepareTool(QMAKE_REPC, repc) diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro -index c2e2b6b..93c2bb5 100644 +index 454f0d1..7c1d2ee 100644 --- a/qtremoteobjects.pro +++ b/qtremoteobjects.pro -@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools +@@ -4,3 +4,8 @@ CONFIG += examples_need_tools tests_need_tools load(qt_parts) SUBDIRS += mkspecs |