diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-27 13:16:32 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-27 13:18:14 +0300 |
| commit | 8b4a01436c10cfd79db28f6462f0769dc7de0539 (patch) | |
| tree | 023392a145b7690b580079ef92371e992b06a648 /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 710f5bcf4c4ffc4bb32dc0da523e7307909b8f6b (diff) | |
| parent | cfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
* upstream/master:
cfcd40e3 qtbase: Restrict 'tests' build to distros with 'ptest' support
0d4af49f qt5-ptest: give rwx permission to user for all the test files
d2ff90b2 qtquicktimeline: upgrade to 5.15 rc1
790bc195 qtquicktimeline: add recipe
07a54bf2 qt5: upgrade to 5.15 rc1
288cdf60 qtwebengine: Fix build with musl
ac9951b2 qtquick3d: Add module prefix for enabling assimp
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtcoap_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtquicktimeline_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I9ba9efdb2b62ecf23b919499d58d51b8a8c7c4a3
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
0 files changed, 0 insertions, 0 deletions