diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-07-08 10:42:24 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-07-14 09:41:21 +0300 |
| commit | 959ee369cc1b8b748062df66c7d7293a9ca65b9b (patch) | |
| tree | a4b3b5cf4dd981526adbf2939e12adaad0e08c95 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
| parent | 86c0596edecdac628a4ca65016040819323468e8 (diff) | |
| parent | 1650757f4182435a63985f73e477ed80927f0eac (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
The updated pyqt5 recipe removed from build as it had incorrect
checksum & SRC_URI seems to be inaccessible (it is a snapshot build
that seems to get overwritten by the next build, meaning the
package version defined in pyqt5 recipe title is accessible only a
short while).
Vulkan PACKAGECONFIG already included in our layer, removed the duplicate
entry.
* upstream/master:
1650757f python3-pyqt5: Update to 5.15 version
e8a44772 ogl-runtime: update to v2.7.0
098b9aca qt5-creator_git: add x11 and opengl to REQUIRED_DISTRO_FEATURES
fbbd24d9 qtwayland: conditional to support PACKAGECONFIG wayland-egl
62bb2ca6 qtbase: Add vulkan to PACKAGECONFIGs
b4340317 qt5: upgrade to 5.15.0
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
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/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtlottie_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtquicktimeline_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I35e5db6b4f122290c2ff0c011d68636edde8e861
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 9b5a96b2..31961d91 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 934acc13090f1d394a2f81a033d2901b42d3ef97 Mon Sep 17 00:00:00 2001 +From a6f536ce5753e95d2ecfd392ebc7deb37aceea09 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri -index c02af390..98af1d68 100644 +index 455a2e3c..6178d860 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") { |