39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 24 Sep 2018 02:11:10 -0700
|
|
Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths
|
|
|
|
If we do not use this define,then it falls into else case which
|
|
generated .pri files with /usr/include and so on for includes and
|
|
compiler does not like specifying absolute include paths pointing to
|
|
build host includes
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Pending
|
|
---
|
|
Source/WebKit/PlatformQt.cmake | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
|
|
index 9aed9906e..48638aef4 100644
|
|
--- a/Source/WebKit/PlatformQt.cmake
|
|
+++ b/Source/WebKit/PlatformQt.cmake
|
|
@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
|
|
install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
|
|
endif ()
|
|
|
|
-if (KDE_INSTALL_USE_QT_SYS_PATHS)
|
|
+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
|
|
set(WebKit_PRI_ARGUMENTS
|
|
BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
|
|
LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
|
|
@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
|
|
install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
|
|
endif ()
|
|
|
|
-if (KDE_INSTALL_USE_QT_SYS_PATHS)
|
|
+if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
|
|
set(WebKitWidgets_PRI_ARGUMENTS
|
|
BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
|
|
LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
|