1*4882a593SmuzhiyunFrom 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com>
3*4882a593SmuzhiyunDate: Mon, 24 Sep 2018 02:11:10 -0700
4*4882a593SmuzhiyunSubject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunIf we do not use this define,then it falls into else case which
7*4882a593Smuzhiyungenerated .pri files with /usr/include and so on for includes and
8*4882a593Smuzhiyuncompiler does not like specifying absolute include paths pointing to
9*4882a593Smuzhiyunbuild host includes
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com>
12*4882a593SmuzhiyunUpstream-Status: Pending
13*4882a593Smuzhiyun---
14*4882a593Smuzhiyun Source/WebKit/PlatformQt.cmake | 4 ++--
15*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
18*4882a593Smuzhiyunindex 9aed9906e..48638aef4 100644
19*4882a593Smuzhiyun--- a/Source/WebKit/PlatformQt.cmake
20*4882a593Smuzhiyun+++ b/Source/WebKit/PlatformQt.cmake
21*4882a593Smuzhiyun@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
22*4882a593Smuzhiyun     install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
23*4882a593Smuzhiyun endif ()
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun-if (KDE_INSTALL_USE_QT_SYS_PATHS)
26*4882a593Smuzhiyun+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
27*4882a593Smuzhiyun     set(WebKit_PRI_ARGUMENTS
28*4882a593Smuzhiyun         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
29*4882a593Smuzhiyun         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
30*4882a593Smuzhiyun@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
31*4882a593Smuzhiyun     install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
32*4882a593Smuzhiyun endif ()
33*4882a593Smuzhiyun
34*4882a593Smuzhiyun-if (KDE_INSTALL_USE_QT_SYS_PATHS)
35*4882a593Smuzhiyun+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
36*4882a593Smuzhiyun     set(WebKitWidgets_PRI_ARGUMENTS
37*4882a593Smuzhiyun         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
38*4882a593Smuzhiyun         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
39