summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
diff options
context:
space:
mode:
authorChenxi Mao <parheliamm@126.com>2020-04-10 08:46:18 +0800
committerChenxi Mao <parheliamm@126.com>2020-04-11 15:21:38 +0800
commitdd2fd47dc0acdf90f73a639149aa59269a72f9cb (patch)
tree84a26d65e6cb33040db0b77b79177f4801696f9d /recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
parent84278d09aef9f917dd695df8c424c5d61395bdf3 (diff)
downloadmeta-qt5-dd2fd47dc0acdf90f73a639149aa59269a72f9cb.tar.gz
QTWebKit: Fix build error on QT-5.15 branch
There are 2 changes to build QtWebkit on QT-5.15 1. Move SHA1 to QTwebkit tag QtWebKit 5.212.0 Alpha 4 SHA1: 444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1 2. Remove python3 patch. Fixes: QTBUG-83426 Change-Id: I6a1f1d8a29c828e28e3c8192c1b863a85991080e Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
new file mode 100644
index 00000000..14cb8aa4
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
@@ -0,0 +1,37 @@
1From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 Sep 2018 02:11:10 -0700
4Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths
5
6If we do not use this define,then it falls into else case which
7generated .pri files with /usr/include and so on for includes and
8compiler does not like specifying absolute include paths pointing to
9build host includes
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Source/WebKit/PlatformQt.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
17index 9aed9906e..48638aef4 100644
18--- a/Source/WebKit/PlatformQt.cmake
19+++ b/Source/WebKit/PlatformQt.cmake
20@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
21 install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
22 endif ()
23
24-if (KDE_INSTALL_USE_QT_SYS_PATHS)
25+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
26 set(WebKit_PRI_ARGUMENTS
27 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
28 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
29@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
30 install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
31 endif ()
32
33-if (KDE_INSTALL_USE_QT_SYS_PATHS)
34+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
35 set(WebKitWidgets_PRI_ARGUMENTS
36 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
37 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"