diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-23 09:59:44 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-23 10:01:20 +0300 |
| commit | 04b592b904c931aa0adf804e44693e285c3ac515 (patch) | |
| tree | e19aebea6b08d1aa2325cf646ace0241be25f7d5 /recipes-qt/qt5/qtbase_git.bb | |
| parent | c70fe7061bc5ed86122e5151cbd66a3963ac0d3e (diff) | |
| parent | 283dd73e3cda0161970d5fb5f0b757f7b32bcf63 (diff) | |
Merge remote-tracking branch 'upstream/master' into lts-5.15
changelog:
283dd73e qtwebengine: Fix build with gcc-12
Conflicts:
recipes-qt/qt5/qtwebengine_git.bb
Change-Id: I21ac66a98dbe13edbba9f1155436537848d9d9a5
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
0 files changed, 0 insertions, 0 deletions