diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-22 10:26:45 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-25 09:19:26 +0200 |
commit | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch) | |
tree | 2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |
parent | fd86202d56c542011d24dc518457631bc00901c9 (diff) | |
parent | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff) | |
download | meta-qt5-929b2ef266c6eb4cc1f5500f421fda449cd8900b.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13:
12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
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" | ||