diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-10 09:53:46 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-11 10:48:26 +0300 |
| commit | bf923061ee01f9fd93bed5550861d4f2ca8b06f1 (patch) | |
| tree | 47e31095a6ebc4e834c3858e097048f88c8d985d /recipes-qt/qt5/qtxmlpatterns_git.bb | |
| parent | 79a0e938922f85638b578a9ae0f21c8856176e68 (diff) | |
| parent | 6442c54d10750016083b06a8bc22b9bffc5e26a2 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.13
* upstream/master:
6442c54 qt3d-runtime: update to ogl-runtime v2.4
7bb213b qtvirtualkeyboard: update supported layouts
eb63611 qt5-creator: Fix clangformat with clang 9.x
12ea469 qttools: Add CONFIG+=config_clang_done when not building with clang
dc502d5 qtwebengine: Fix compile failure with 5.2+ kernel headers
8799d3b qtserialbus: Fix build with 5.2+ kernel headers
e8aa2dd qtwebengine: Add pulseaudio support
4d8f350 qtwebengine: Rename jasoncpp to jsoncpp
725c87d qtwayland: do not reference private modules in cmake Qt5WaylandClient
a41cd9e qtwayland: remove workaround for missing private headers (QTBUG-71340)
Conflicts:
recipes-qt/qt5/qtserialbus_git.bb
Change-Id: I8f5248fb6f320555a231f59cddeb4c18ff810259
Diffstat (limited to 'recipes-qt/qt5/qtxmlpatterns_git.bb')
0 files changed, 0 insertions, 0 deletions