diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-27 19:44:33 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-02-03 13:38:06 +0100 |
commit | 239147405e04945e086ce972ff50375bc8259071 (patch) | |
tree | 70287bcaaa4bfa91d928a9eb371693a0860d5239 /recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |
parent | 8cadcbcb52af124417cdc29eb94bf8cdfe86f3d4 (diff) | |
download | meta-qt5-239147405e04945e086ce972ff50375bc8259071.tar.gz |
Revert "qtwebkit: remove"
This reverts commit a35403dcf6b75ee7355108cab3e466009003b1a7.
But keep the dependency from packagegroup-qt5-toolchain-target, qt5-creator
removed as most people won't really need this. Andreas and meta-qt5-extra
still need qtwebkit as reported here:
https://github.com/meta-qt5/meta-qt5/pull/273#issuecomment-578536852
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch new file mode 100644 index 00000000..14cb8aa4 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 24 Sep 2018 02:11:10 -0700 | ||
4 | Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths | ||
5 | |||
6 | If we do not use this define,then it falls into else case which | ||
7 | generated .pri files with /usr/include and so on for includes and | ||
8 | compiler does not like specifying absolute include paths pointing to | ||
9 | build host includes | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Source/WebKit/PlatformQt.cmake | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake | ||
17 | index 9aed9906e..48638aef4 100644 | ||
18 | --- a/Source/WebKit/PlatformQt.cmake | ||
19 | +++ b/Source/WebKit/PlatformQt.cmake | ||
20 | @@ -512,7 +512,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 | @@ -737,7 +737,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" | ||