diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-01-25 13:42:03 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-01-26 06:53:22 +0000 |
| commit | 893f82716fd6dc0f69321649e2df59712467dd2f (patch) | |
| tree | c80ecfdd5efcc8c53aae508d51f0499a833767f0 /recipes-qt/qt5/qtwayland_git.bb | |
| parent | 9b71d80c5ffe6c53904e164e81f8917327743187 (diff) | |
| parent | b64b0a213240375e697185de06c3f502c65cdee7 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
Timezone DST calculation already applied in lts-5.15 in an almost
identical form by commit 8406739dd2b6aeeaa9ef0c88f12e354f830b08ca.
changelog:
b64b0a21 qtwayland: Fix vulkan build on GLES2
7865f41c nativesdk-qtbase: inherit pkgconfig
d2d295d4 qtbase: Fix timezone DST calculation
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
Task-number: QTBUG-99976
Change-Id: Iebf21c3a8444eea1556498c2527187c6bd4942c3
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a66a5421..6981bea6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = " \ # 5.15.meta-qt5.1 SRC_URI += "file://0001-tst_seatv4-Include-array.patch \ file://0001-linux-dmabuf-unstable-v1-Include-missing-array-heade.patch \ + file://0001-Fix-vulkan-buffer-formats-for-GLES2.patch \ " PACKAGECONFIG ?= " \ |