diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-01-11 09:20:54 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-01-11 13:00:46 +0200 |
| commit | 7b36bfcfaeac2c470a2bde9f96eac13434986154 (patch) | |
| tree | c1ca107a7d4032e27bb29b4e7902c28371290643 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | a02581b881e2bc7026eba1db8a66dcfce1012ce2 (diff) | |
| parent | 1d1b19ff577835bf847152eed44d52e8267d9093 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
* Removed pyqtchart receipe from build as updated dependency (sip3 -> sip)
is not present in meta-openembedded dunfell branch.
* Removed Creator patch for API change that got fixed in updated creator
revision.
changelog:
1d1b19ff qtwebkit: Add packageconfig to build tools
88c8564e qtwebkit: Fix build with ruby 3.2+
b119822b qtpdf,qtwebengine: Fix build with 64bit time_t
f1ac1203 qtbase: Fix build with 64bit time_t on glibc
8159b71f layer.conf: update LAYERSERIES_COMPAT for mickledore
c22b8fac qt5-creator: bump SRCREV to fix compatibility with newer qt
c555401f qtbase: add -DUSE_X11 Flag
2df0f760 qt5: upgrade to v5.15.7-lts-lgpl
1a917695 packagegroup-qt5-toolchain-target: Add qtquickcontrols2-qmlplugins RRECOMMENDS:${PN}
8363b198 qtbase-native: Reduce TMPDIR QA false positives for rcc generated files
Task-number: QTBUG-109765
Change-Id: I97f2ef1f1d572768eacfd75e483ef341342c54bd
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index d0b02287..dc8e0f41 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -45,14 +45,16 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.3 +# 5.15.meta-qt5-native.4 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0023-Always-build-uic-and-qvkgen.patch \ + file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |