diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebkit | |
parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
download | meta-qt5-5.13.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
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/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch (renamed from recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch (renamed from recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch) | 11 |
4 files changed, 7 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch index 4b2b2759..a237d03d 100644 --- a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch +++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1a4e33ac630b0e4f285e238479900f0e10c6d15f Mon Sep 17 00:00:00 2001 | 1 | From 34018c2a61045c58f88e09a12ecd62533aa2c2f1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Mon, 4 Jun 2018 10:35:46 +0200 | 3 | Date: Mon, 4 Jun 2018 10:35:46 +0200 |
4 | Subject: [PATCH] Do not skip build for cross-compile | 4 | Subject: [PATCH] Do not skip build for cross-compile |
diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch index dead46d1..bf79b363 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9db9a8850602c2446b1a7ee96608fd74cf56a342 Mon Sep 17 00:00:00 2001 | 1 | From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 23 Aug 2018 04:06:17 +0000 | 3 | Date: Thu, 23 Aug 2018 04:06:17 +0000 |
4 | Subject: [PATCH] Fix build with non-glibc libc on musl | 4 | Subject: [PATCH] Fix build with non-glibc libc on musl |
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch index 23fed74f..ffd8da0f 100644 --- a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5aa039af074c20bea1398f7f18712dc494a5f138 Mon Sep 17 00:00:00 2001 | 1 | From f6576377f8bf2c854d8079b7f309f570b3d2bde4 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> |
3 | Date: Fri, 31 Aug 2018 15:42:48 +0900 | 3 | Date: Fri, 31 Aug 2018 15:42:48 +0900 |
4 | Subject: [PATCH] Fix build bug for armv32 BE. | 4 | Subject: [PATCH] Fix build bug for armv32 BE. |
diff --git a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch index 8c718b47..14cb8aa4 100644 --- a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch +++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c00c61a42f9076aecad195b7f72b7db9b3601181 Mon Sep 17 00:00:00 2001 | 1 | From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 24 Sep 2018 02:11:10 -0700 | 3 | Date: Mon, 24 Sep 2018 02:11:10 -0700 |
4 | Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths | 4 | Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake | 16 | diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake |
17 | index 3792def6f..b6cb36bb1 100644 | 17 | index 9aed9906e..48638aef4 100644 |
18 | --- a/Source/WebKit/PlatformQt.cmake | 18 | --- a/Source/WebKit/PlatformQt.cmake |
19 | +++ b/Source/WebKit/PlatformQt.cmake | 19 | +++ b/Source/WebKit/PlatformQt.cmake |
20 | @@ -510,7 +510,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) | 20 | @@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) |
21 | install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) | 21 | install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) |
22 | endif () | 22 | endif () |
23 | 23 | ||
@@ -26,7 +26,7 @@ index 3792def6f..b6cb36bb1 100644 | |||
26 | set(WebKit_PRI_ARGUMENTS | 26 | set(WebKit_PRI_ARGUMENTS |
27 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" | 27 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" |
28 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" | 28 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" |
29 | @@ -734,7 +734,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) | 29 | @@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) |
30 | install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) | 30 | install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) |
31 | endif () | 31 | endif () |
32 | 32 | ||
@@ -35,6 +35,3 @@ index 3792def6f..b6cb36bb1 100644 | |||
35 | set(WebKitWidgets_PRI_ARGUMENTS | 35 | set(WebKitWidgets_PRI_ARGUMENTS |
36 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" | 36 | BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" |
37 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" | 37 | LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" |
38 | -- | ||
39 | 2.19.0 | ||
40 | |||