summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-24 03:28:57 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-25 09:22:19 +0000
commitd498eb607514eefaf0548c4377d5c8cdbdcb46c3 (patch)
tree4d30465d6a6048273348c921ad4d6656fa10af5c /recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
parentb716195f609de6547cfdfadfd4fd25292a6bbf09 (diff)
downloadmeta-qt5-d498eb607514eefaf0548c4377d5c8cdbdcb46c3.tar.gz
qtwebkit: Use relative paths for pri files when cross compile
This helps in compiling examples etc. without hardcoded headers Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
new file mode 100644
index 00000000..8c718b47
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
@@ -0,0 +1,40 @@
1From c00c61a42f9076aecad195b7f72b7db9b3601181 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 3792def6f..b6cb36bb1 100644
18--- a/Source/WebKit/PlatformQt.cmake
19+++ b/Source/WebKit/PlatformQt.cmake
20@@ -510,7 +510,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@@ -734,7 +734,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"
38--
392.19.0
40