summaryrefslogtreecommitdiffstats
path: root/external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch')
-rw-r--r--external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
deleted file mode 100644
index 8c718b47..00000000
--- a/external/meta-qt5/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c00c61a42f9076aecad195b7f72b7db9b3601181 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>
----
- 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 3792def6f..b6cb36bb1 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -510,7 +510,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"
-@@ -734,7 +734,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"
---
-2.19.0
-