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>
12Upstream-Status: Pending
13---
14 Source/WebKit/PlatformQt.cmake | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
18index 9aed9906e..48638aef4 100644
19--- a/Source/WebKit/PlatformQt.cmake
20+++ b/Source/WebKit/PlatformQt.cmake
21@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
22     install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
23 endif ()
24
25-if (KDE_INSTALL_USE_QT_SYS_PATHS)
26+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
27     set(WebKit_PRI_ARGUMENTS
28         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
29         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
30@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
31     install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
32 endif ()
33
34-if (KDE_INSTALL_USE_QT_SYS_PATHS)
35+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
36     set(WebKitWidgets_PRI_ARGUMENTS
37         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
38         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
39