diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-08-06 10:28:35 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-08-06 15:07:42 +0300 |
| commit | 2ae1a1a432429fd4a8b80b4a8288198a86827d31 (patch) | |
| tree | fbc41ba065305182c8d1b8645896a5c42f62ed6f /recipes-qt/qt5/qtwebengine | |
| parent | 959ee369cc1b8b748062df66c7d7293a9ca65b9b (diff) | |
qt5: update submodules
Update to latest content in Qt 5.15 branch.
Change-Id: I1f245a9ea0631fd5684865a87e898988f178ce8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch index f1fa3ed3..fa7de449 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From 178aefa97fd7b725b1b802af7751df5f86a887af Mon Sep 17 00:00:00 2001 +From cc707f6c2d3dd152fcca23de0545351e99b3edcb Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo @@ -10,13 +10,13 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 5007012a..56c7ad4a 100644 +index 3b439e81..b1669e19 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro -@@ -57,7 +57,7 @@ linux { - POST_TARGETDEPS += $$NINJA_TARGETDEPS - +@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) + api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix() + api_library_path = $$OUT_PWD/api/$$getConfigDir() -LIBS_PRIVATE += -L$$api_library_path +LIBS_PRIVATE += -L$$api_library_path -lexecinfo CONFIG *= no_smart_library_merge |