diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-05-02 08:22:34 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-05-02 05:38:35 +0000 |
| commit | c1d26389b932757bbaba36830d9bc7a2716fc6f8 (patch) | |
| tree | 7f2d2fece9bc0e100ae31a44c7753175c1692000 /recipes-qt/qt5/qtbase_git.bb | |
| parent | 8bcd605984af55001ff94c9127590eec29547a91 (diff) | |
| parent | cf6ffcbad5275a3428f6046468a0c9d572e813d1 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
The qtbase patch was removed in a change in previous upstream merge commit. This merge brings it back with necessary SRC_URI updates.
changelog:
cf6ffcba qt3d,qtquick3d: Update assimp SRC_URI
7b83cadb qtbase: Fix build on 32bit arches with 64bit time_t
77b6060c qtsmarthome: update SRC_URI
Change-Id: I0d9d5d61655b7699e96b2a0fc7554be8a49da1c7
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 703c28d6..55e58d4a 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -36,6 +36,7 @@ SRC_URI += "\ 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 \ + file://0023-Remove-unsetting-_FILE_OFFSET_BITS.patch \ " # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with |