diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch | |
parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
download | meta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
Diffstat (limited to 'recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch index e681bfbb..a12ba359 100644 --- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001 | 1 | From 9d40b6e665f67f5096eba41bea13492d3eda056c Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | 3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 |
4 | Subject: [PATCH] Bootstrap without linkat feature | 4 | Subject: [PATCH] Bootstrap without linkat feature |
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific] | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | 15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h |
16 | index 30166fe41c..e06f75541b 100644 | 16 | index 8cfa40e461..f2fba9ebd8 100644 |
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | 17 | --- a/src/corelib/global/qconfig-bootstrapped.h |
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | 18 | +++ b/src/corelib/global/qconfig-bootstrapped.h |
19 | @@ -91,7 +91,7 @@ | 19 | @@ -91,7 +91,7 @@ |