diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 12:32:13 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 09:03:25 +0200 |
commit | 5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (patch) | |
tree | 970f133c757794bcdc024acff5e053ca621ad47d /recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch | |
parent | c29bdf41c4494e278a17a233048205bf212e040f (diff) | |
parent | de2ecaa13fde8f30b1a6558bbbbdfecfd3cd4bd8 (diff) | |
download | meta-qt5-5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14:
de2ecaa1 coin: update module_config.yaml with meta-python2 support
f9a58d62 Merge remote-tracking branch 'qt/upstream/master' into 5.14
2da972e5 qt5: update submodules
9be6548e qt5: update submodules
b5e4f925 qtquicktimeline: add recipe
abb42351 (qt/upstream/master) qtwebview: Skip if meta-python is not present
caf09cd5 Add PyQtChart.
f18d5948 qtbase: fix build with platform where FE macro are not defined
c8cd55b0 qtwebkit: build with python3
0bbd0ebe qtwebengine: Link libatomic on x86/32bit
23914740 Revert "qtwebkit: remove"
8cadcbcb qt5: upgrade to 5.14.1
f13a3cec packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH
a35403dc qtwebkit: remove
a797f85c python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2
b1f4f1fd Revert "recipes: Use python3 during build"
47fb26de recipes: Use python3 during build
4060f68d qt-kiosk-browser: Only support arm/x86
fd376e15 qtwebengine: Fix missing headers found in build with clang
7f324f11 gstreamer1.0-plugins-good: Adjust bbappend for meson migration in core
1365691f qttools: remove ptest installation
254576f9 qt-kiosk-browser: Add recipe
47399df9 nativesdk-packagegroup: fix cmake builds using sdk
Conflicts:
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtcoap_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
Change-Id: I41b3b999dc1278342e33dda3b66af1990e8da090
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, 0 insertions, 37 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 deleted file mode 100644 index 14cb8aa4..00000000 --- a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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" | ||